[CSS Parser] Support unprefixed image-sets
authorhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 30 Oct 2016 13:42:39 +0000 (13:42 +0000)
committerhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 30 Oct 2016 13:42:39 +0000 (13:42 +0000)
https://bugs.webkit.org/show_bug.cgi?id=164198

Reviewed by Dean Jackson.

* css/CSSValueKeywords.in:
* css/parser/CSSPropertyParserHelpers.cpp:
(WebCore::CSSPropertyParserHelpers::consumeImage):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@208125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/ChangeLog
Source/WebCore/css/CSSValueKeywords.in
Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp

index ba44c26..12e9332 100644 (file)
@@ -1,3 +1,14 @@
+2016-10-29  Dave Hyatt  <hyatt@apple.com>
+
+        [CSS Parser] Support unprefixed image-sets
+        https://bugs.webkit.org/show_bug.cgi?id=164198
+
+        Reviewed by Dean Jackson.
+
+        * css/CSSValueKeywords.in:
+        * css/parser/CSSPropertyParserHelpers.cpp:
+        (WebCore::CSSPropertyParserHelpers::consumeImage):
+
 2016-10-30  Yusuke Suzuki  <utatane.tea@gmail.com>
 
         [DOM] Introduce WebCore::jsDynamicDowncast
index 396cb3a..113e2e3 100644 (file)
@@ -1150,6 +1150,7 @@ isolate
 scale-down
 
 // background-image, etc.
+image-set
 linear-gradient
 radial-gradient
 repeating-linear-gradient
index 66c0440..8028734 100644 (file)
@@ -1158,7 +1158,7 @@ RefPtr<CSSValue> consumeImage(CSSParserTokenRange& range, CSSParserContext conte
         return CSSImageValue::create(completeURL(context, uri));
     if (range.peek().type() == FunctionToken) {
         CSSValueID id = range.peek().functionId();
-        if (id == CSSValueWebkitImageSet)
+        if (id == CSSValueWebkitImageSet || id == CSSValueImageSet)
             return consumeImageSet(range, context);
         if (generatedImage == ConsumeGeneratedImage::Allow && isGeneratedImage(id))
             return consumeGeneratedImage(range, context);