roytam1/UXP
1
0
Fork 0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-26 13:58:49 +00:00
Code Issues Projects Releases Wiki Activity

Issue #1826 - Add typed calc() arithmetic for media queries

Browse Source
This commit is contained in:
Basilisk-Dev
2026-05-06 07:58:56 -04:00
committed by roytam1
parent f94a63864c
commit 12b120db24
4 changed files with 234 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/style/CSSCalc.h
+2 -10
View File
@@ -318,11 +318,7 @@ SerializeCalcInternal(const typename CalcOps::input_type& aValue, CalcOps &aOps)
if (needParens) {
aOps.Append("(");
}
if (unit == eCSSUnit_Calc_Times_L) {
aOps.AppendNumber(array->Item(0));
} else {
SerializeCalcInternal(array->Item(0), aOps);
}
SerializeCalcInternal(array->Item(0), aOps);
if (needParens) {
aOps.Append(")");
}
@@ -340,11 +336,7 @@ SerializeCalcInternal(const typename CalcOps::input_type& aValue, CalcOps &aOps)
if (needParens) {
aOps.Append("(");
}
if (unit == eCSSUnit_Calc_Times_L) {
SerializeCalcInternal(array->Item(1), aOps);
} else {
aOps.AppendNumber(array->Item(1));
}
SerializeCalcInternal(array->Item(1), aOps);
if (needParens) {
aOps.Append(")");
}
layout/style/CSSStyleSheet.cpp
+105 -2
View File
@@ -130,6 +130,106 @@ int32_t DoCompare(Numeric a, Numeric b)
return 1;
}
struct MediaQueryTypedCalcLengthResult
{
double mValue;
int32_t mExponent;
};
static bool
EvaluateMediaQueryTypedCalcLength(nsPresContext* aPresContext,
const nsCSSValue& aValue,
MediaQueryTypedCalcLengthResult& aResult)
{
switch (aValue.GetUnit()) {
case eCSSUnit_Calc: {
nsCSSValue::Array* array = aValue.GetArrayValue();
MOZ_ASSERT(array->Count() == 1, "unexpected length");
return EvaluateMediaQueryTypedCalcLength(aPresContext, array->Item(0),
aResult);
}
case eCSSUnit_Calc_Plus:
case eCSSUnit_Calc_Minus: {
nsCSSValue::Array* array = aValue.GetArrayValue();
MOZ_ASSERT(array->Count() == 2, "unexpected length");
MediaQueryTypedCalcLengthResult lhs;
MediaQueryTypedCalcLengthResult rhs;
if (!EvaluateMediaQueryTypedCalcLength(aPresContext, array->Item(0), lhs) ||
!EvaluateMediaQueryTypedCalcLength(aPresContext, array->Item(1), rhs) ||
lhs.mExponent != rhs.mExponent) {
return false;
}
aResult.mExponent = lhs.mExponent;
aResult.mValue = aValue.GetUnit() == eCSSUnit_Calc_Plus
? lhs.mValue + rhs.mValue
: lhs.mValue - rhs.mValue;
return true;
}
case eCSSUnit_Calc_Times_L:
case eCSSUnit_Calc_Times_R:
case eCSSUnit_Calc_Divided: {
nsCSSValue::Array* array = aValue.GetArrayValue();
MOZ_ASSERT(array->Count() == 2, "unexpected length");
MediaQueryTypedCalcLengthResult lhs;
MediaQueryTypedCalcLengthResult rhs;
if (!EvaluateMediaQueryTypedCalcLength(aPresContext, array->Item(0), lhs) ||
!EvaluateMediaQueryTypedCalcLength(aPresContext, array->Item(1), rhs)) {
return false;
}
if (aValue.GetUnit() == eCSSUnit_Calc_Divided) {
if (rhs.mValue == 0.0) {
return false;
}
aResult.mValue = lhs.mValue / rhs.mValue;
aResult.mExponent = lhs.mExponent - rhs.mExponent;
} else {
aResult.mValue = lhs.mValue * rhs.mValue;
aResult.mExponent = lhs.mExponent + rhs.mExponent;
}
return true;
}
case eCSSUnit_Number:
aResult.mValue = aValue.GetFloatValue();
aResult.mExponent = 0;
return true;
default:
break;
}
if (!aValue.IsLengthUnit()) {
return false;
}
aResult.mValue = double(nsRuleNode::CalcLengthWithInitialFont(aPresContext,
aValue));
aResult.mExponent = 1;
return true;
}
static bool
ComputeMediaQueryTypedCalcLength(nsPresContext* aPresContext,
const nsCSSValue& aValue,
nscoord& aResult)
{
if (aValue.IsLengthUnit()) {
aResult = nsRuleNode::CalcLengthWithInitialFont(aPresContext, aValue);
return true;
}
MediaQueryTypedCalcLengthResult result;
if (!EvaluateMediaQueryTypedCalcLength(aPresContext, aValue, result) ||
result.mExponent != 1) {
return false;
}
aResult = NSToCoordFloorClamped(result.mValue);
return true;
}
bool
nsMediaExpression::Matches(nsPresContext *aPresContext,
const nsCSSValue& aActualValue) const
@@ -165,8 +265,11 @@ nsMediaExpression::Matches(nsPresContext *aPresContext,
"bad required value");
nscoord actualCoord = nsRuleNode::CalcLengthWithInitialFont(
aPresContext, actual);
nscoord requiredCoord = nsRuleNode::CalcLengthWithInitialFont(
aPresContext, required);
nscoord requiredCoord;
if (!ComputeMediaQueryTypedCalcLength(aPresContext, required,
requiredCoord)) {
return false;
}
cmp = DoCompare(actualCoord, requiredCoord);
}
break;
layout/style/nsCSSParser.cpp
+112 -5
View File
@@ -262,6 +262,65 @@ RoundFloatToCSSInteger(float aValue)
return int32_t(rounded);
}
static bool
GetCalcLengthTypedArithmeticExponent(const nsCSSValue& aValue,
int32_t& aExponent)
{
switch (aValue.GetUnit()) {
case eCSSUnit_Calc: {
nsCSSValue::Array* array = aValue.GetArrayValue();
MOZ_ASSERT(array->Count() == 1, "unexpected length");
return GetCalcLengthTypedArithmeticExponent(array->Item(0), aExponent);
}
case eCSSUnit_Calc_Plus:
case eCSSUnit_Calc_Minus: {
nsCSSValue::Array* array = aValue.GetArrayValue();
MOZ_ASSERT(array->Count() == 2, "unexpected length");
int32_t lhsExponent;
int32_t rhsExponent;
if (!GetCalcLengthTypedArithmeticExponent(array->Item(0), lhsExponent) ||
!GetCalcLengthTypedArithmeticExponent(array->Item(1), rhsExponent) ||
lhsExponent != rhsExponent) {
return false;
}
aExponent = lhsExponent;
return true;
}
case eCSSUnit_Calc_Times_L:
case eCSSUnit_Calc_Times_R:
case eCSSUnit_Calc_Divided: {
nsCSSValue::Array* array = aValue.GetArrayValue();
MOZ_ASSERT(array->Count() == 2, "unexpected length");
int32_t lhsExponent;
int32_t rhsExponent;
if (!GetCalcLengthTypedArithmeticExponent(array->Item(0), lhsExponent) ||
!GetCalcLengthTypedArithmeticExponent(array->Item(1), rhsExponent)) {
return false;
}
aExponent = aValue.GetUnit() == eCSSUnit_Calc_Divided
? lhsExponent - rhsExponent
: lhsExponent + rhsExponent;
return true;
}
case eCSSUnit_Number:
aExponent = 0;
return true;
default:
break;
}
if (aValue.IsLengthUnit()) {
aExponent = 1;
return true;
}
return false;
}
static bool
NormalizeCalcForVariant(nsCSSValue& aValue,
uint32_t aPropertyVariantMask,
@@ -1728,6 +1787,7 @@ protected:
// not be set to false if any nsCSSValues created during parsing can escape
// out of the parser.
bool mSheetPrincipalRequired;
bool mCalcAllowsTypedArithmetic;
// This enum helps us track whether we've unprefixed "display: -webkit-box"
// (treating it as "display: flex") in an earlier declaration within a series
@@ -1832,6 +1892,7 @@ CSSParserImpl::CSSParserImpl()
mInFailingSupportsRule(false),
mSuppressErrors(false),
mSheetPrincipalRequired(true),
mCalcAllowsTypedArithmetic(false),
mWebkitBoxUnprefixState(eNotParsingDecls),
mNextFree(nullptr)
{
@@ -3999,8 +4060,12 @@ CSSParserImpl::ParseMediaQueryExpression(nsMediaQuery* aQuery)
bool rv = false;
switch (feature->mValueType) {
case nsMediaFeature::eLength:
rv = ParseSingleTokenNonNegativeVariant(expr->mValue, VARIANT_LCALC,
nullptr);
{
AutoRestore<bool> autoRestore(mCalcAllowsTypedArithmetic);
mCalcAllowsTypedArithmetic = true;
rv = ParseSingleTokenNonNegativeVariant(expr->mValue, VARIANT_LCALC,
nullptr);
}
break;
case nsMediaFeature::eInteger:
case nsMediaFeature::eBoolInteger:
@@ -14838,6 +14903,25 @@ CSSParserImpl::ParseCalc(nsCSSValue& aValue, uint32_t aVariantMask,
if (!ParseCalcAdditiveExpression(arr->Item(0), resultVariantMask))
break;
if (mCalcAllowsTypedArithmetic) {
int32_t exponent;
if (!GetCalcLengthTypedArithmeticExponent(arr->Item(0), exponent)) {
break;
}
if (aVariantMask & VARIANT_NUMBER) {
if (exponent == 0) {
resultVariantMask = VARIANT_NUMBER;
} else if (exponent == 1) {
resultVariantMask &= ~int32_t(VARIANT_NUMBER);
} else {
break;
}
} else if (exponent != 1) {
break;
}
}
if (!ExpectSymbol(')', true))
break;
@@ -14918,13 +15002,16 @@ CSSParserImpl::ParseCalcMultiplicativeExpression(nsCSSValue& aValue,
bool *aHadFinalWS)
{
MOZ_ASSERT(aVariantMask != 0, "unexpected variant mask");
bool allowTypedArithmetic = mCalcAllowsTypedArithmetic;
bool gotValue = false; // already got the part with the unit
bool afterDivision = false;
nsCSSValue *storage = &aValue;
for (;;) {
uint32_t variantMask;
if (afterDivision || gotValue) {
if (allowTypedArithmetic) {
variantMask = aVariantMask | VARIANT_NUMBER;
} else if (afterDivision || gotValue) {
variantMask = VARIANT_NUMBER;
} else {
variantMask = aVariantMask | VARIANT_NUMBER;
@@ -14945,7 +15032,7 @@ CSSParserImpl::ParseCalcMultiplicativeExpression(nsCSSValue& aValue,
if (number == 0.0 && afterDivision)
return false;
storage->SetFloatValue(number, eCSSUnit_Number);
} else {
} else if (!allowTypedArithmetic) {
gotValue = true;
if (storage != &aValue) {
@@ -14967,7 +15054,10 @@ CSSParserImpl::ParseCalcMultiplicativeExpression(nsCSSValue& aValue,
}
nsCSSUnit unit;
if (mToken.IsSymbol('*')) {
unit = gotValue ? eCSSUnit_Calc_Times_R : eCSSUnit_Calc_Times_L;
unit = allowTypedArithmetic
? eCSSUnit_Calc_Times_R
: (gotValue ? eCSSUnit_Calc_Times_R
: eCSSUnit_Calc_Times_L);
afterDivision = false;
} else if (mToken.IsSymbol('/')) {
unit = eCSSUnit_Calc_Divided;
@@ -14986,6 +15076,23 @@ CSSParserImpl::ParseCalcMultiplicativeExpression(nsCSSValue& aValue,
// Adjust aVariantMask (see comments above function) to reflect which
// option we took.
if (allowTypedArithmetic) {
int32_t exponent;
if (!GetCalcLengthTypedArithmeticExponent(aValue, exponent)) {
return false;
}
if (aVariantMask & VARIANT_NUMBER) {
if (exponent == 0) {
aVariantMask = VARIANT_NUMBER;
} else {
aVariantMask &= ~int32_t(VARIANT_NUMBER);
}
}
return true;
}
if (aVariantMask & VARIANT_NUMBER) {
if (gotValue) {
aVariantMask &= ~int32_t(VARIANT_NUMBER);
layout/style/test/test_media_queries.html
+15
View File
@@ -315,6 +315,21 @@ function run() {
(Math.floor(value/em_size) - 1) + "rem)");
}
change_state(function() {
iframe_style.width = "100px";
iframe_style.height = "10px";
});
should_apply("all and (width: calc(100px / 1em * 1em))");
should_apply("all and (width: calc((50vh * 5em) / 4px))");
should_apply("all and (width: calc(10vw / 10px * 1000vh))");
should_apply("all and (width: calc(8000vh * 1vw / 1em * 8px / 40vh))");
should_not_apply("all and (width: calc(100px / 1em * 2em))");
change_state(function() {
iframe_style.width = width_val + "px";
iframe_style.height = height_val + "px";
});
change_state(function() {
iframe_style.width = "0";
});