roytam1/basilisk55
1
0
Fork 0
mirror of https://github.com/roytam1/basilisk55.git synced 2026-06-10 02:28:39 +00:00
Code Issues Projects Releases Wiki Activity

ported from custom branch of UXP: [CSS] Add calc availability to color functions. (8a0897d2)

Browse Source
This commit is contained in:
roytam1
2022-04-29 15:37:31 +08:00
parent ece5e73ff3
commit 2baff3e5ed
1 changed files with 47 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
layout/style/nsCSSParser.cpp
+47 -15
View File
@@ -1180,6 +1180,14 @@ protected:
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>
bool ParseRGBColor(ComponentType& aR,
ComponentType& aG,
@@ -6796,7 +6804,7 @@ CSSParserImpl::ParseColor(nsCSSValue& aValue)
if (GetToken(true)) {
UngetToken();
}
if (mToken.mType == eCSSToken_Number) { // <number>
if (mToken.mType == eCSSToken_Number || mToken.mType == eCSSToken_Function) { // <number>
uint8_t r, g, b, a;
if (ParseRGBColor(r, g, b, a)) {
@@ -6903,14 +6911,24 @@ CSSParserImpl::ParseColorComponent(uint8_t& aComponent, Maybe<char> aSeparator)
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);
UngetToken();
return false;
}
float value = mToken.mNumber;
if (aSeparator && !ExpectSymbol(*aSeparator, true)) {
REPORT_UNEXPECTED_TOKEN_CHAR(PEColorComponentBadTerm, *aSeparator);
return false;
@@ -6931,14 +6949,24 @@ CSSParserImpl::ParseColorComponent(float& aComponent, Maybe<char> aSeparator)
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);
UngetToken();
return false;
}
float value = mToken.mNumber;
if (aSeparator && !ExpectSymbol(*aSeparator, true)) {
REPORT_UNEXPECTED_TOKEN_CHAR(PEColorComponentBadTerm, *aSeparator);
return false;
@@ -6964,6 +6992,17 @@ CSSParserImpl::ParseHue(float& aAngle)
aAngle = mToken.mNumber;
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();
// <angle>
@@ -7865,13 +7904,6 @@ CSSParserImpl::ParseOneOrLargerVariant(nsCSSValue& aValue,
return result;
}
static bool
IsCSSTokenCalcFunction(const nsCSSToken& aToken)
{
return aToken.mType == eCSSToken_Function &&
aToken.mIdent.LowerCaseEqualsLiteral("calc");
}
// Assigns to aValue iff it returns CSSParseResult::Ok.
CSSParseResult
CSSParserImpl::ParseVariant(nsCSSValue& aValue,
@@ -10885,7 +10917,7 @@ CSSParserImpl::ParseWebkitGradientRadius(float& aRadius)
// (either a percentage or a number between 0 and 1.0), and a color (any
// valid CSS color). In addition the shorthand functions from and to are
// supported. These functions only require a color argument and are
// equivalent to color-stop(0, ...) and color-stop(1.0, …) respectively.
// equivalent to color-stop(0, ...) and color-stop(1.0, ...) respectively.
bool
CSSParserImpl::ParseWebkitGradientColorStop(nsCSSValueGradient* aGradient)
{