Attachment 358173 Details for Bug 193067 – Patch

[patch] Patch

bug-193067-20190101115603.patch (text/plain), 9.20 KB, created by Simon Fraser (smfr) on 2019-01-01 11:56:04 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Simon Fraser (smfr)

Created: 2019-01-01 11:56:04 PST

Size: 9.20 KB

patch

obsolete

>Subversion Revision: 239533
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 24291ccefc4f8271e4ba829b7e3040b12bccf0ba..a13c74405a68eda0047394e3945a03cda8a5c327 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,27 @@
>+2019-01-01  Simon Fraser  <simon.fraser@apple.com>
>+
>+        Don't spin up a CalcParser if the current token is not a function token
>+        https://bugs.webkit.org/show_bug.cgi?id=193067
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Various functions in CSSPropertyParserHelpers fall back to trying to parse
>+        a calc expression if the normal parsing fails. Don't do this unless the
>+        current token is a function token, which should be slightly more efficient.
>+
>+        * css/parser/CSSPropertyParserHelpers.cpp:
>+        (WebCore::CSSPropertyParserHelpers::consumeInteger):
>+        (WebCore::CSSPropertyParserHelpers::consumePositiveIntegerRaw):
>+        (WebCore::CSSPropertyParserHelpers::consumeNumberRaw):
>+        (WebCore::CSSPropertyParserHelpers::consumeNumber):
>+        (WebCore::CSSPropertyParserHelpers::consumeFontWeightNumber):
>+        (WebCore::CSSPropertyParserHelpers::consumeLength):
>+        (WebCore::CSSPropertyParserHelpers::consumePercent):
>+        (WebCore::CSSPropertyParserHelpers::consumeLengthOrPercent):
>+        (WebCore::CSSPropertyParserHelpers::consumeAngle):
>+        (WebCore::CSSPropertyParserHelpers::consumeAngleOrPercent):
>+        (WebCore::CSSPropertyParserHelpers::consumeTime):
>+
> 2018-12-21  Youenn Fablet  <youenn@apple.com>
> 
>         RTCRtpSender.setParameters() does set active parameter
>diff --git a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>index 03b11ae33ac5512efa12ecf6a31efec49f7cb3d0..6f8ede8af4196aa3358ec109b8b26ab8d844a381 100644
>--- a/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>+++ b/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp
>@@ -139,14 +139,17 @@ RefPtr<CSSPrimitiveValue> consumeInteger(CSSParserTokenRange& range, double mini
>             return nullptr;
>         return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::CSS_NUMBER);
>     }
>-    CalcParser calcParser(range, CalculationCategory::Number);
>-    if (const CSSCalcValue* calculation = calcParser.value()) {
>-        if (calculation->category() != CalculationCategory::Number || !calculation->isInt())
>-            return nullptr;
>-        double value = calculation->doubleValue();
>-        if (value < minimumValue)
>-            return nullptr;
>-        return calcParser.consumeNumber();
>+
>+    if (token.type() == FunctionToken) {
>+        CalcParser calcParser(range, CalculationCategory::Number);
>+        if (const CSSCalcValue* calculation = calcParser.value()) {
>+            if (calculation->category() != CalculationCategory::Number || !calculation->isInt())
>+                return nullptr;
>+            double value = calculation->doubleValue();
>+            if (value < minimumValue)
>+                return nullptr;
>+            return calcParser.consumeNumber();
>+        }
>     }
>     return nullptr;
> }
>@@ -165,16 +168,25 @@ bool consumePositiveIntegerRaw(CSSParserTokenRange& range, int& result)
>         result = range.consumeIncludingWhitespace().numericValue();
>         return true;
>     }
>+
>+    if (token.type() != FunctionToken)
>+        return false;
>+
>     CalcParser calcParser(range, CalculationCategory::Number);
>     return calcParser.consumePositiveIntegerRaw(result);
> }
>     
> bool consumeNumberRaw(CSSParserTokenRange& range, double& result)
> {
>-    if (range.peek().type() == NumberToken) {
>+    const CSSParserToken& token = range.peek();
>+    if (token.type() == NumberToken) {
>         result = range.consumeIncludingWhitespace().numericValue();
>         return true;
>     }
>+
>+    if (token.type() != FunctionToken)
>+        return false;
>+
>     CalcParser calcParser(range, CalculationCategory::Number, ValueRangeAll);
>     return calcParser.consumeNumberRaw(result);
> }
>@@ -188,6 +200,10 @@ RefPtr<CSSPrimitiveValue> consumeNumber(CSSParserTokenRange& range, ValueRange v
>             return nullptr;
>         return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), token.unitType());
>     }
>+
>+    if (token.type() != FunctionToken)
>+        return nullptr;
>+
>     CalcParser calcParser(range, CalculationCategory::Number, ValueRangeAll);
>     if (const CSSCalcValue* calculation = calcParser.value()) {
>         // FIXME: Calcs should not be subject to parse time range checks.
>@@ -196,6 +212,7 @@ RefPtr<CSSPrimitiveValue> consumeNumber(CSSParserTokenRange& range, ValueRange v
>             return nullptr;
>         return calcParser.consumeNumber();
>     }
>+
>     return nullptr;
> }
> 
>@@ -217,6 +234,9 @@ RefPtr<CSSPrimitiveValue> consumeFontWeightNumber(CSSParserTokenRange& range)
>     )
>         return consumeNumber(range, ValueRangeAll);
> 
>+    if (token.type() != FunctionToken)
>+        return nullptr;
>+
>     // "[For calc()], the used value resulting from an expression must be clamped to the range allowed in the target context."
>     CalcParser calcParser(range, CalculationCategory::Number, ValueRangeAll);
>     double result;
>@@ -280,9 +300,14 @@ RefPtr<CSSPrimitiveValue> consumeLength(CSSParserTokenRange& range, CSSParserMod
>         CSSPrimitiveValue::UnitType unitType = CSSPrimitiveValue::UnitType::CSS_PX;
>         return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), unitType);
>     }
>+
>+    if (token.type() != FunctionToken)
>+        return nullptr;
>+
>     CalcParser calcParser(range, CalculationCategory::Length, valueRange);
>     if (calcParser.value() && calcParser.value()->category() == CalculationCategory::Length)
>         return calcParser.consumeValue();
>+
>     return nullptr;
> }
> 
>@@ -294,6 +319,10 @@ RefPtr<CSSPrimitiveValue> consumePercent(CSSParserTokenRange& range, ValueRange
>             return nullptr;
>         return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::CSS_PERCENTAGE);
>     }
>+
>+    if (token.type() != FunctionToken)
>+        return nullptr;
>+
>     CalcParser calcParser(range, CalculationCategory::Percent, valueRange);
>     if (const CSSCalcValue* calculation = calcParser.value()) {
>         if (calculation->category() == CalculationCategory::Percent)
>@@ -323,6 +352,10 @@ RefPtr<CSSPrimitiveValue> consumeLengthOrPercent(CSSParserTokenRange& range, CSS
>         return consumeLength(range, cssParserMode, valueRange, unitless);
>     if (token.type() == PercentageToken)
>         return consumePercent(range, valueRange);
>+
>+    if (token.type() != FunctionToken)
>+        return nullptr;
>+
>     CalcParser calcParser(range, CalculationCategory::Length, valueRange);
>     if (const CSSCalcValue* calculation = calcParser.value()) {
>         if (canConsumeCalcValue(calculation->category(), cssParserMode))
>@@ -345,9 +378,12 @@ RefPtr<CSSPrimitiveValue> consumeAngle(CSSParserTokenRange& range, CSSParserMode
>             return nullptr;
>         }
>     }
>-    if (token.type() == NumberToken && shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless)) {
>+
>+    if (token.type() == NumberToken && shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless))
>         return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::CSS_DEG);
>-    }
>+
>+    if (token.type() != FunctionToken)
>+        return nullptr;
> 
>     CalcParser calcParser(range, CalculationCategory::Angle, ValueRangeAll);
>     if (const CSSCalcValue* calculation = calcParser.value()) {
>@@ -371,11 +407,16 @@ static RefPtr<CSSPrimitiveValue> consumeAngleOrPercent(CSSParserTokenRange& rang
>             return nullptr;
>         }
>     }
>+
>     if (token.type() == NumberToken && shouldAcceptUnitlessValue(token.numericValue(), cssParserMode, unitless))
>         return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), CSSPrimitiveValue::UnitType::CSS_DEG);
>+
>     if (token.type() == PercentageToken)
>         return consumePercent(range, valueRange);
> 
>+    if (token.type() != FunctionToken)
>+        return nullptr;
>+
>     CalcParser calcParser(range, CalculationCategory::Angle, valueRange);
>     if (const CSSCalcValue* calculation = calcParser.value()) {
>         if (calculation->category() == CalculationCategory::Angle)
>@@ -384,7 +425,6 @@ static RefPtr<CSSPrimitiveValue> consumeAngleOrPercent(CSSParserTokenRange& rang
>     return nullptr;
> }
> 
>-
> RefPtr<CSSPrimitiveValue> consumeTime(CSSParserTokenRange& range, CSSParserMode cssParserMode, ValueRange valueRange, UnitlessQuirk unitless)
> {
>     const CSSParserToken& token = range.peek();
>@@ -399,6 +439,10 @@ RefPtr<CSSPrimitiveValue> consumeTime(CSSParserTokenRange& range, CSSParserMode
>             return CSSValuePool::singleton().createValue(range.consumeIncludingWhitespace().numericValue(), unit);
>         return nullptr;
>     }
>+
>+    if (token.type() != FunctionToken)
>+        return nullptr;
>+
>     CalcParser calcParser(range, CalculationCategory::Time, valueRange);
>     if (const CSSCalcValue* calculation = calcParser.value()) {
>         if (calculation->category() == CalculationCategory::Time)

Actions: View | Formatted Diff | Diff

Attachments on bug 193067: 358173 | 358174