Changeset 209006 in webkit

Timestamp:

Nov 28, 2016 12:28:15 PM (7 years ago)

Author:

hyatt@apple.com

Message:

[CSS Parser] Filters and Reflections Fixes
​https://bugs.webkit.org/show_bug.cgi?id=165103

Reviewed by Zalan Bujtas.

• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeReflect):
Support the "none" keyword for box-reflect.

• css/parser/CSSPropertyParserHelpers.cpp:

(WebCore::CSSPropertyParserHelpers::isValidPrimitiveFilterFunction):
(WebCore::CSSPropertyParserHelpers::consumeFilterFunction):
Don't rely on range checking, since invert isn't grouped with the other
function values. Actually check every keyword.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/parser/CSSPropertyParser.cpp (modified) (1 diff)
• css/parser/CSSPropertyParserHelpers.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-28  Dave Hyatt  <hyatt@apple.com>
+
+        [CSS Parser] Filters and Reflections Fixes
+        https://bugs.webkit.org/show_bug.cgi?id=165103
+
+        Reviewed by Zalan Bujtas.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeReflect):
+        Support the "none" keyword for box-reflect.
+
+        * css/parser/CSSPropertyParserHelpers.cpp:
+        (WebCore::CSSPropertyParserHelpers::isValidPrimitiveFilterFunction):
+        (WebCore::CSSPropertyParserHelpers::consumeFilterFunction):
+        Don't rely on range checking, since invert isn't grouped with the other
+        function values. Actually check every keyword.
+
 2016-11-28  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

@@ -2621 +2621 @@
 static RefPtr<CSSValue> consumeReflect(CSSParserTokenRange& range, const CSSParserContext& context)
 {
+    if (range.peek().id() == CSSValueNone)
+        return consumeIdent(range);
+    
     RefPtr<CSSPrimitiveValue> direction = consumeIdent<CSSValueAbove, CSSValueBelow, CSSValueLeft, CSSValueRight>(range);
     if (!direction)

trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp

@@ -1183 +1183 @@
         || id == CSSValueCrossFade || id == CSSValueWebkitNamedImage || id == CSSValueWebkitFilter || id == CSSValueFilter;
 }
+    
+static bool isValidPrimitiveFilterFunction(CSSValueID filterFunction)
+{
+    switch (filterFunction) {
+    case CSSValueBlur:
+    case CSSValueBrightness:
+    case CSSValueContrast:
+    case CSSValueDropShadow:
+    case CSSValueGrayscale:
+    case CSSValueHueRotate:
+    case CSSValueInvert:
+    case CSSValueOpacity:
+    case CSSValueSaturate:
+    case CSSValueSepia:
+        return true;
+    default:
+        return false;
+    }
+}
 
 RefPtr<CSSFunctionValue> consumeFilterFunction(CSSParserTokenRange& range, const CSSParserContext& context)
 {
     CSSValueID filterType = range.peek().functionId();
-    if (filterType < CSSValueInvert || filterType > CSSValueDropShadow)
+    if (!isValidPrimitiveFilterFunction(filterType))
         return nullptr;
     CSSParserTokenRange args = consumeFunction(range);
-    auto filterValue = CSSFunctionValue::create(filterType);
+    RefPtr<CSSFunctionValue> filterValue = CSSFunctionValue::create(filterType);
     RefPtr<CSSValue> parsedValue;
 
@@ -1197 +1216 @@
     else {
         if (args.atEnd())
-            return filterValue.ptr();
+            return filterValue;
         if (filterType == CSSValueBrightness) {
             parsedValue = consumePercent(args, ValueRangeAll);
@@ -1220 +1239 @@
     if (!parsedValue || !args.atEnd())
         return nullptr;
-    filterValue->append(*parsedValue);
-    return filterValue.ptr();
+    filterValue->append(parsedValue.releaseNonNull());
+    return filterValue;
 }