wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-21 22:57:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

[CSS] Add calc availability to color functions.

Browse source
This commit is contained in:
Fedor 2021-07-23 19:54:52 +03:00 • committed by roytam1
commit 8a0897d23f
1 changed files with 61 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

91
layout/style/nsCSSParser.cpp
View file

@ -1178,6 +1178,14 @@ protected:
CSSParseResult ParseColor(nsCSSValue& aValue); CSSParseResult ParseColor(nsCSSValue& aValue);
static bool
IsCSSTokenCalcFunction(const nsCSSToken& aToken)
{
return aToken.mType == eCSSToken_Function &&
(aToken.mIdent.LowerCaseEqualsLiteral("calc") ||
aToken.mIdent.LowerCaseEqualsLiteral("-moz-calc"));
}
template<typename ComponentType> template<typename ComponentType>
bool ParseRGBColor(ComponentType& aR, bool ParseRGBColor(ComponentType& aR,
ComponentType& aG, ComponentType& aG,
@ -6779,7 +6787,7 @@ CSSParserImpl::ParseColor(nsCSSValue& aValue)
if (GetToken(true)) { if (GetToken(true)) {
UngetToken(); UngetToken();
} }
if (mToken.mType == eCSSToken_Number) { // <number> if (mToken.mType == eCSSToken_Number || mToken.mType == eCSSToken_Function) { // <number>
uint8_t r, g, b, a; uint8_t r, g, b, a;
if (ParseRGBColor(r, g, b, a)) { if (ParseRGBColor(r, g, b, a)) {
@ -6878,6 +6886,21 @@ CSSParserImpl::ParseColor(nsCSSValue& aValue)
return CSSParseResult::NotFound; return CSSParseResult::NotFound;
} }
struct ReduceNumberCalcOps : public mozilla::css::BasicFloatCalcOps,
public mozilla::css::CSSValueInputCalcOps
{
result_type ComputeLeafValue(const nsCSSValue& aValue)
{
MOZ_ASSERT(aValue.GetUnit() == eCSSUnit_Number, "unexpected unit");
return aValue.GetFloatValue();
}
float ComputeNumber(const nsCSSValue& aValue)
{
return mozilla::css::ComputeCalc(aValue, *this);
}
};
bool bool
CSSParserImpl::ParseColorComponent(uint8_t& aComponent, Maybe<char> aSeparator) CSSParserImpl::ParseColorComponent(uint8_t& aComponent, Maybe<char> aSeparator)
{ {
@ -6886,14 +6909,24 @@ CSSParserImpl::ParseColorComponent(uint8_t& aComponent, Maybe<char> aSeparator)
return false; return false;
} }
if (mToken.mType != eCSSToken_Number) { float value;
if (mToken.mType == eCSSToken_Number)
value = mToken.mNumber;
else if (IsCSSTokenCalcFunction(mToken)) {
nsCSSValue aValue;
if (!ParseCalc(aValue, VARIANT_LPN | VARIANT_CALC)) {
return false;
}
ReduceNumberCalcOps ops;
value = mozilla::css::ComputeCalc(aValue, ops);
}
else {
REPORT_UNEXPECTED_TOKEN(PEExpectedNumber); REPORT_UNEXPECTED_TOKEN(PEExpectedNumber);
UngetToken(); UngetToken();
return false; return false;
} }
float value = mToken.mNumber;
if (aSeparator && !ExpectSymbol(*aSeparator, true)) { if (aSeparator && !ExpectSymbol(*aSeparator, true)) {
REPORT_UNEXPECTED_TOKEN_CHAR(PEColorComponentBadTerm, *aSeparator); REPORT_UNEXPECTED_TOKEN_CHAR(PEColorComponentBadTerm, *aSeparator);
return false; return false;
@ -6914,14 +6947,24 @@ CSSParserImpl::ParseColorComponent(float& aComponent, Maybe<char> aSeparator)
return false; return false;
} }
if (mToken.mType != eCSSToken_Percentage) { float value;
if (mToken.mType == eCSSToken_Percentage)
value = mToken.mNumber;
else if (IsCSSTokenCalcFunction(mToken)) {
nsCSSValue aValue;
if (!ParseCalc(aValue, VARIANT_LPN | VARIANT_CALC)) {
return false;
}
ReduceNumberCalcOps ops;
value = mozilla::css::ComputeCalc(aValue, ops);
}
else {
REPORT_UNEXPECTED_TOKEN(PEExpectedPercent); REPORT_UNEXPECTED_TOKEN(PEExpectedPercent);
UngetToken(); UngetToken();
return false; return false;
} }
float value = mToken.mNumber;
if (aSeparator && !ExpectSymbol(*aSeparator, true)) { if (aSeparator && !ExpectSymbol(*aSeparator, true)) {
REPORT_UNEXPECTED_TOKEN_CHAR(PEColorComponentBadTerm, *aSeparator); REPORT_UNEXPECTED_TOKEN_CHAR(PEColorComponentBadTerm, *aSeparator);
return false; return false;
@ -6947,6 +6990,17 @@ CSSParserImpl::ParseHue(float& aAngle)
aAngle = mToken.mNumber; aAngle = mToken.mNumber;
return true; return true;
} }
if (IsCSSTokenCalcFunction(mToken)) {
nsCSSValue aValue;
if (!ParseCalc(aValue, VARIANT_LPN | VARIANT_CALC)) {
return false;
}
ReduceNumberCalcOps ops;
aAngle = mozilla::css::ComputeCalc(aValue, ops);
return true;
}
UngetToken(); UngetToken();
// <angle> // <angle>
@ -7852,14 +7906,6 @@ CSSParserImpl::ParseOneOrLargerVariant(nsCSSValue& aValue,
return result; return result;
} }
static bool
IsCSSTokenCalcFunction(const nsCSSToken& aToken)
{
return aToken.mType == eCSSToken_Function &&
(aToken.mIdent.LowerCaseEqualsLiteral("calc") ||
aToken.mIdent.LowerCaseEqualsLiteral("-moz-calc"));
}
// Assigns to aValue iff it returns CSSParseResult::Ok. // Assigns to aValue iff it returns CSSParseResult::Ok.
CSSParseResult CSSParseResult
CSSParserImpl::ParseVariant(nsCSSValue& aValue, CSSParserImpl::ParseVariant(nsCSSValue& aValue,
@ -13817,21 +13863,6 @@ CSSParserImpl::ParseCalcAdditiveExpression(nsCSSValue& aValue,
} }
} }
struct ReduceNumberCalcOps : public mozilla::css::BasicFloatCalcOps,
public mozilla::css::CSSValueInputCalcOps
{
result_type ComputeLeafValue(const nsCSSValue& aValue)
{
MOZ_ASSERT(aValue.GetUnit() == eCSSUnit_Number, "unexpected unit");
return aValue.GetFloatValue();
}
float ComputeNumber(const nsCSSValue& aValue)
{
return mozilla::css::ComputeCalc(aValue, *this);
}
};
// * If aVariantMask is VARIANT_NUMBER, this function parses the // * If aVariantMask is VARIANT_NUMBER, this function parses the
// <number-multiplicative-expression> production. // <number-multiplicative-expression> production.
// * If aVariantMask does not contain VARIANT_NUMBER, this function // * If aVariantMask does not contain VARIANT_NUMBER, this function