Changeset 208029 in webkit

Timestamp:

Oct 27, 2016 9:11:18 PM (8 years ago)

Author:

hyatt@apple.com

Message:

[CSS Parser] Add support for a reference box to -webkit-clip-path
​https://bugs.webkit.org/show_bug.cgi?id=164107

Reviewed by Simon Fraser.

• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeBasicShape):
(WebCore::consumeBasicShapeOrBox):
(WebCore::consumeWebkitClipPath):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-27  Dave Hyatt  <hyatt@apple.com>
+
+        [CSS Parser] Add support for a reference box to -webkit-clip-path
+        https://bugs.webkit.org/show_bug.cgi?id=164107
+
+        Reviewed by Simon Fraser.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeBasicShape):
+        (WebCore::consumeBasicShapeOrBox):
+        (WebCore::consumeWebkitClipPath):
+
 2016-10-27  Yusuke Suzuki  <utatane.tea@gmail.com>
 

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

@@ -2204 +2204 @@
     else if (id == CSSValueInset)
         shape = consumeBasicShapeInset(args, context);
-    if (!shape || !args.atEnd())
+    if (!shape)
         return nullptr;
     range = rangeCopy;
@@ -2211 +2211 @@
 }
 
+static RefPtr<CSSValue> consumeBasicShapeOrBox(CSSParserTokenRange& range, const CSSParserContext& context)
+{
+    RefPtr<CSSValueList> list = CSSValueList::createSpaceSeparated();
+    bool shapeFound = false;
+    bool boxFound = false;
+    while (!range.atEnd() && !(shapeFound && boxFound)) {
+        RefPtr<CSSValue> componentValue;
+        if (range.peek().type() == FunctionToken && !shapeFound) {
+            componentValue = consumeBasicShape(range, context);
+            shapeFound = true;
+        } else if (range.peek().type() == IdentToken && !boxFound) {
+            componentValue = consumeIdent<CSSValueContentBox, CSSValuePaddingBox, CSSValueBorderBox, CSSValueFill, CSSValueStroke, CSSValueViewBox>(range);
+            boxFound = true;
+        }
+        if (!componentValue)
+            return nullptr;
+        list->append(componentValue.releaseNonNull());
+    }
+    
+    if (!range.atEnd())
+        return nullptr;
+    
+    return list;
+}
+    
 static RefPtr<CSSValue> consumeWebkitClipPath(CSSParserTokenRange& range, const CSSParserContext& context)
 {
@@ -2217 +2242 @@
     if (RefPtr<CSSPrimitiveValue> url = consumeUrl(range))
         return url;
-    return consumeBasicShape(range, context);
+    return consumeBasicShapeOrBox(range, context);
 }