[CSS Blending] Remove support for non-separable blend modes from background-blend...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 May 2014 09:35:34 +0000 (09:35 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 2 May 2014 09:35:34 +0000 (09:35 +0000)
https://bugs.webkit.org/show_bug.cgi?id=132327

Patch by Ion Rosca <rosca@adobe.com> on 2014-05-02
Reviewed by Dean Jackson.

Source/WebCore:
Removed support for non-separable background blend modes from the CSS parser.
Covered by existing tests.

* css/CSSParser.cpp:
(WebCore::CSSParser::parseFillProperty):

LayoutTests:
* css3/compositing/background-blend-mode-gif-color-2.html:
* css3/compositing/background-blend-mode-gif-color.html:
* css3/compositing/background-blend-mode-gradient-color.html:
* css3/compositing/background-blend-mode-gradient-gradient.html:
* css3/compositing/background-blend-mode-gradient-image.html:
* css3/compositing/background-blend-mode-image-color.html:
* css3/compositing/background-blend-mode-image-image.html:
* css3/compositing/background-blend-mode-image-svg.html:
* css3/compositing/background-blend-mode-multiple-background-layers.html:
* css3/compositing/background-blend-mode-property-expected.txt:
* css3/compositing/background-blend-mode-property-parsing-expected.txt:
* css3/compositing/background-blend-mode-svg-color.html:
* css3/compositing/effect-background-blend-mode-tiled.html:
* css3/compositing/effect-background-blend-mode.html:
* css3/compositing/script-tests/background-blend-mode-property-parsing.js:
* css3/compositing/script-tests/background-blend-mode-property.js:
* platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.png:
* platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.txt:
* platform/mac/css3/compositing/background-blend-mode-gif-color-expected.png:
* platform/mac/css3/compositing/background-blend-mode-gif-color-expected.txt:
* platform/mac/css3/compositing/background-blend-mode-gradient-color-expected.png:
* platform/mac/css3/compositing/background-blend-mode-gradient-gradient-expected.png:
* platform/mac/css3/compositing/background-blend-mode-gradient-image-expected.png:
* platform/mac/css3/compositing/background-blend-mode-image-color-expected.png:
* platform/mac/css3/compositing/background-blend-mode-image-color-expected.txt:
* platform/mac/css3/compositing/background-blend-mode-image-image-expected.png:
* platform/mac/css3/compositing/background-blend-mode-image-image-expected.txt:
* platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png:
* platform/mac/css3/compositing/background-blend-mode-multiple-background-layers-expected.png:
* platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png:

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

33 files changed:
LayoutTests/ChangeLog
LayoutTests/css3/compositing/background-blend-mode-gif-color-2.html
LayoutTests/css3/compositing/background-blend-mode-gif-color.html
LayoutTests/css3/compositing/background-blend-mode-gradient-color.html
LayoutTests/css3/compositing/background-blend-mode-gradient-gradient.html
LayoutTests/css3/compositing/background-blend-mode-gradient-image.html
LayoutTests/css3/compositing/background-blend-mode-image-color.html
LayoutTests/css3/compositing/background-blend-mode-image-image.html
LayoutTests/css3/compositing/background-blend-mode-image-svg.html
LayoutTests/css3/compositing/background-blend-mode-multiple-background-layers.html
LayoutTests/css3/compositing/background-blend-mode-property-expected.txt
LayoutTests/css3/compositing/background-blend-mode-property-parsing-expected.txt
LayoutTests/css3/compositing/background-blend-mode-svg-color.html
LayoutTests/css3/compositing/effect-background-blend-mode-tiled.html
LayoutTests/css3/compositing/effect-background-blend-mode.html
LayoutTests/css3/compositing/script-tests/background-blend-mode-property-parsing.js
LayoutTests/css3/compositing/script-tests/background-blend-mode-property.js
LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.txt
LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-expected.txt
LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-color-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-gradient-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-image-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-color-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-color-expected.txt
LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-image-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-image-expected.txt
LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-multiple-background-layers-expected.png
LayoutTests/platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png
Source/WebCore/ChangeLog
Source/WebCore/css/CSSParser.cpp

index 24cebea..a535d80 100644 (file)
@@ -1,3 +1,41 @@
+2014-05-02  Ion Rosca  <rosca@adobe.com>
+
+        [CSS Blending] Remove support for non-separable blend modes from background-blend-mode
+        https://bugs.webkit.org/show_bug.cgi?id=132327
+
+        Reviewed by Dean Jackson.
+
+        * css3/compositing/background-blend-mode-gif-color-2.html:
+        * css3/compositing/background-blend-mode-gif-color.html:
+        * css3/compositing/background-blend-mode-gradient-color.html:
+        * css3/compositing/background-blend-mode-gradient-gradient.html:
+        * css3/compositing/background-blend-mode-gradient-image.html:
+        * css3/compositing/background-blend-mode-image-color.html:
+        * css3/compositing/background-blend-mode-image-image.html:
+        * css3/compositing/background-blend-mode-image-svg.html:
+        * css3/compositing/background-blend-mode-multiple-background-layers.html:
+        * css3/compositing/background-blend-mode-property-expected.txt:
+        * css3/compositing/background-blend-mode-property-parsing-expected.txt:
+        * css3/compositing/background-blend-mode-svg-color.html:
+        * css3/compositing/effect-background-blend-mode-tiled.html:
+        * css3/compositing/effect-background-blend-mode.html:
+        * css3/compositing/script-tests/background-blend-mode-property-parsing.js:
+        * css3/compositing/script-tests/background-blend-mode-property.js:
+        * platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.txt:
+        * platform/mac/css3/compositing/background-blend-mode-gif-color-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-gif-color-expected.txt:
+        * platform/mac/css3/compositing/background-blend-mode-gradient-color-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-gradient-gradient-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-gradient-image-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-image-color-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-image-color-expected.txt:
+        * platform/mac/css3/compositing/background-blend-mode-image-image-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-image-image-expected.txt:
+        * platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-multiple-background-layers-expected.png:
+        * platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png:
+
 2014-05-01  Alexey Proskuryakov  <ap@apple.com>
 
         REGRESSION(r125251): It made svg/custom/use-instanceRoot-as-event-target.xhtml assert and flakey
index 7455b7a..7140dfc 100644 (file)
     <div style="background-blend-mode: soft-light, normal"></div>
     <div style="background-blend-mode: difference, normal"></div>
     <div style="background-blend-mode: exclusion, normal"></div>
-    <div style="background-blend-mode: hue, normal;"></div>
-    <div style="background-blend-mode: saturation, normal"></div>
-    <div style="background-blend-mode: color, normal"></div>
-    <div style="background-blend-mode: luminosity, normal"></div>
     <script type="text/javascript">
         window.setTimeout("done()", 400);
     </script>
index 5a2c4eb..5503195 100644 (file)
@@ -24,9 +24,5 @@
     <div style="background-blend-mode: soft-light, normal"></div>
     <div style="background-blend-mode: difference, normal"></div>
     <div style="background-blend-mode: exclusion, normal"></div>
-    <div style="background-blend-mode: hue, normal;"></div>
-    <div style="background-blend-mode: saturation, normal"></div>
-    <div style="background-blend-mode: color, normal"></div>
-    <div style="background-blend-mode: luminosity, normal"></div>
 </body>
 </html>
index 94c8c49..03b16d5 100644 (file)
         <li style="background-blend-mode: soft-light, normal"></li>
         <li style="background-blend-mode: difference, normal"></li>
         <li style="background-blend-mode: exclusion, normal"></li>
-        <li style="background-blend-mode: hue, normal;"></li>
-        <li style="background-blend-mode: saturation, normal"></li>
-        <li style="background-blend-mode: color, normal"></li>
-        <li style="background-blend-mode: luminosity, normal"></li>
     </ul>
 </body>
 
index 4fb80bd..10ae4fa 100644 (file)
         <li style="background-blend-mode: soft-light, normal"></li>
         <li style="background-blend-mode: difference, normal"></li>
         <li style="background-blend-mode: exclusion, normal"></li>
-        <li style="background-blend-mode: hue, normal;"></li>
-        <li style="background-blend-mode: saturation, normal"></li>
-        <li style="background-blend-mode: color, normal"></li>
-        <li style="background-blend-mode: luminosity, normal"></li>
     </ul>
 </body>
 
index 4d97d6b..491fb15 100644 (file)
         <li style="background-blend-mode: soft-light, normal"></li>
         <li style="background-blend-mode: difference, normal"></li>
         <li style="background-blend-mode: exclusion, normal"></li>
-        <li style="background-blend-mode: hue, normal;"></li>
-        <li style="background-blend-mode: saturation, normal"></li>
-        <li style="background-blend-mode: color, normal"></li>
-        <li style="background-blend-mode: luminosity, normal"></li>
     </ul>
 </body>
 
index f060f64..40ed2cd 100644 (file)
         <li style="background-blend-mode: soft-light, normal"></li>
         <li style="background-blend-mode: difference, normal"></li>
         <li style="background-blend-mode: exclusion, normal"></li>
-        <li style="background-blend-mode: hue, normal;"></li>
-        <li style="background-blend-mode: saturation, normal"></li>
-        <li style="background-blend-mode: color, normal"></li>
-        <li style="background-blend-mode: luminosity, normal"></li>
     </ul>
 </body>
 
index 702035b..8b6f698 100644 (file)
         <li style="background-blend-mode: soft-light, normal"></li>
         <li style="background-blend-mode: difference, normal"></li>
         <li style="background-blend-mode: exclusion, normal"></li>
-        <li style="background-blend-mode: hue, normal;"></li>
-        <li style="background-blend-mode: saturation, normal"></li>
-        <li style="background-blend-mode: color, normal"></li>
-        <li style="background-blend-mode: luminosity, normal"></li>
     </ul>
 </body>
 
index 696a451..3f2dc5c 100644 (file)
         <li style="background-blend-mode: soft-light, normal"></li>
         <li style="background-blend-mode: difference, normal"></li>
         <li style="background-blend-mode: exclusion, normal"></li>
-        <li style="background-blend-mode: hue, normal;"></li>
-        <li style="background-blend-mode: saturation, normal"></li>
-        <li style="background-blend-mode: color, normal"></li>
-        <li style="background-blend-mode: luminosity, normal"></li>
     </ul>
 </body>
 
index 6ca1975..90e0aaa 100644 (file)
@@ -16,7 +16,7 @@
 </head>
 <!-- This file should contain two divs with 3 background layers. Test background blend mode differences when only one layer blends differently. -->
 <body>
-    <div style="background-blend-mode: hue, difference, normal;"></div>
+    <div style="background-blend-mode: multiply, difference, normal;"></div>
     <div style="background-blend-mode: difference, difference, normal;"></div>
 </body>
 </html>
index d94ab27..7cff22e 100644 (file)
@@ -39,18 +39,6 @@ PASS declaration.getPropertyValue('background-blend-mode') is 'difference, diffe
 PASS cssRule.type is 1
 PASS declaration.length is 1
 PASS declaration.getPropertyValue('background-blend-mode') is 'exclusion, exclusion'
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'hue, hue'
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'saturation, saturation'
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'color, color'
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'luminosity, luminosity'
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 667235a..e8a6375 100644 (file)
@@ -20,10 +20,10 @@ PASS jsWrapperClass(blendModeRule) is 'CSSValueList'
 PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSValueListPrototype'
 PASS jsWrapperClass(blendModeRule.constructor) is 'CSSValueListConstructor'
 
-Basic reference : screen, hue
+Basic reference : screen, multiply
 PASS cssRule.type is 1
 PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'screen, hue'
+PASS declaration.getPropertyValue('background-blend-mode') is 'screen, multiply'
 PASS jsWrapperClass(blendModeRule) is 'CSSValueList'
 PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSValueListPrototype'
 PASS jsWrapperClass(blendModeRule.constructor) is 'CSSValueListConstructor'
@@ -36,10 +36,10 @@ PASS jsWrapperClass(blendModeRule) is 'CSSValueList'
 PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSValueListPrototype'
 PASS jsWrapperClass(blendModeRule.constructor) is 'CSSValueListConstructor'
 
-Basic reference : darken, lighten, normal, luminosity
+Basic reference : darken, lighten, normal, multiply
 PASS cssRule.type is 1
 PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'darken, lighten, normal, luminosity'
+PASS declaration.getPropertyValue('background-blend-mode') is 'darken, lighten, normal, multiply'
 PASS jsWrapperClass(blendModeRule) is 'CSSValueList'
 PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSValueListPrototype'
 PASS jsWrapperClass(blendModeRule.constructor) is 'CSSValueListConstructor'
@@ -99,38 +99,6 @@ PASS declaration.getPropertyValue('background-blend-mode') is 'exclusion'
 PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
 PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
 PASS jsWrapperClass(blendModeRule.constructor) is 'CSSPrimitiveValueConstructor'
-
-Basic reference : hue
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'hue'
-PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
-PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
-PASS jsWrapperClass(blendModeRule.constructor) is 'CSSPrimitiveValueConstructor'
-
-Basic reference : saturation
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'saturation'
-PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
-PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
-PASS jsWrapperClass(blendModeRule.constructor) is 'CSSPrimitiveValueConstructor'
-
-Basic reference : color
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'color'
-PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
-PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
-PASS jsWrapperClass(blendModeRule.constructor) is 'CSSPrimitiveValueConstructor'
-
-Basic reference : luminosity
-PASS cssRule.type is 1
-PASS declaration.length is 1
-PASS declaration.getPropertyValue('background-blend-mode') is 'luminosity'
-PASS jsWrapperClass(blendModeRule) is 'CSSPrimitiveValue'
-PASS jsWrapperClass(blendModeRule.__proto__) is 'CSSPrimitiveValuePrototype'
-PASS jsWrapperClass(blendModeRule.constructor) is 'CSSPrimitiveValueConstructor'
 PASS successfullyParsed is true
 
 TEST COMPLETE
index 60dcd7c..bfb2d76 100644 (file)
@@ -30,9 +30,5 @@
         <div style="background-blend-mode: soft-light, normal"></div>
         <div style="background-blend-mode: difference, normal"></div>
         <div style="background-blend-mode: exclusion, normal"></div>
-        <div style="background-blend-mode: hue, normal;"></div>
-        <div style="background-blend-mode: saturation, normal"></div>
-        <div style="background-blend-mode: color, normal"></div>
-        <div style="background-blend-mode: luminosity, normal"></div>
 </body>
 </html>
index a76c537..d1bd47b 100644 (file)
@@ -30,10 +30,6 @@ li
 <li style="background-blend-mode: soft-light, normal"></li>
 <li style="background-blend-mode: difference, normal"></li>
 <li style="background-blend-mode: exclusion, normal"></li>
-<li style="background-blend-mode: hue, normal;"></li>
-<li style="background-blend-mode: saturation, normal"></li>
-<li style="background-blend-mode: color, normal"></li>
-<li style="background-blend-mode: luminosity, normal"></li>
 </ul>
 </body>
 
index 8172e93..489dd96 100644 (file)
@@ -33,10 +33,6 @@ li
 <li style="background-blend-mode: soft-light, normal"></li>
 <li style="background-blend-mode: difference, normal"></li>
 <li style="background-blend-mode: exclusion, normal"></li>
-<li style="background-blend-mode: hue, normal;"></li>
-<li style="background-blend-mode: saturation, normal"></li>
-<li style="background-blend-mode: color, normal"></li>
-<li style="background-blend-mode: luminosity, normal"></li>
 </ul>
 </body>
 
index f6644bd..13c8864 100644 (file)
@@ -46,7 +46,7 @@ function testBlendModeRule(description, rule, expectedLength, expectedValue, exp
            shouldBeType("blendModeRule", "CSSValueList");
 }
 
-var blendmodes = ["normal", "multiply, screen", "screen, hue", "overlay, normal", "darken, lighten, normal, luminosity", "lighten", "color-dodge", "color-burn", "hard-light", "soft-light", "difference", "exclusion", "hue", "saturation", "color", "luminosity"];
+var blendmodes = ["normal", "multiply, screen", "screen, multiply", "overlay, normal", "darken, lighten, normal, multiply", "lighten", "color-dodge", "color-burn", "hard-light", "soft-light", "difference", "exclusion"];
 
 for(x in blendmodes)
    testBlendModeRule("Basic reference", blendmodes[x], 1, blendmodes[x]);
index 26ba10d..22f571f 100644 (file)
@@ -20,7 +20,7 @@ shouldBe("declaration.length", "1");
 shouldBe("declaration.getPropertyValue('background-blend-mode')", "\'" + blendmode + ", " + blendmode + "\'");
 }
 
-var blendmodes = ["normal", "multiply", "screen", "overlay", "darken", "lighten", "color-dodge", "color-burn", "hard-light", "soft-light", "difference", "exclusion", "hue", "saturation", "color", "luminosity"];
+var blendmodes = ["normal", "multiply", "screen", "overlay", "darken", "lighten", "color-dodge", "color-burn", "hard-light", "soft-light", "difference", "exclusion"];
 
 for(x in blendmodes)
    testblendmode(blendmodes[x]);
index 53a2a7f..af56a73 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.png differ
index b9499fe..6978cc7 100644 (file)
@@ -14,7 +14,3 @@ layer at (0,0) size 800x428
       RenderBlock (floating) {DIV} at (425,145) size 130x130 [bgcolor=#008000]
       RenderBlock (floating) {DIV} at (565,145) size 130x130 [bgcolor=#008000]
       RenderBlock (floating) {DIV} at (5,285) size 130x130 [bgcolor=#008000]
-      RenderBlock (floating) {DIV} at (145,285) size 130x130 [bgcolor=#008000]
-      RenderBlock (floating) {DIV} at (285,285) size 130x130 [bgcolor=#008000]
-      RenderBlock (floating) {DIV} at (425,285) size 130x130 [bgcolor=#008000]
-      RenderBlock (floating) {DIV} at (565,285) size 130x130 [bgcolor=#008000]
index 2e5201c..75d0ceb 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-expected.png differ
index b9499fe..6978cc7 100644 (file)
@@ -14,7 +14,3 @@ layer at (0,0) size 800x428
       RenderBlock (floating) {DIV} at (425,145) size 130x130 [bgcolor=#008000]
       RenderBlock (floating) {DIV} at (565,145) size 130x130 [bgcolor=#008000]
       RenderBlock (floating) {DIV} at (5,285) size 130x130 [bgcolor=#008000]
-      RenderBlock (floating) {DIV} at (145,285) size 130x130 [bgcolor=#008000]
-      RenderBlock (floating) {DIV} at (285,285) size 130x130 [bgcolor=#008000]
-      RenderBlock (floating) {DIV} at (425,285) size 130x130 [bgcolor=#008000]
-      RenderBlock (floating) {DIV} at (565,285) size 130x130 [bgcolor=#008000]
index f3a82c2..37f68f4 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-color-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-color-expected.png differ
index eaa6a23..f20e68b 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-gradient-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-gradient-expected.png differ
index fadb92c..681a184 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-image-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-image-expected.png differ
index 96fb76e..a273f1e 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-color-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-color-expected.png differ
index 6084759..a0d0433 100644 (file)
@@ -1,7 +1,7 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x576
-  RenderBlock {HTML} at (0,0) size 800x576
+layer at (0,0) size 800x436
+  RenderBlock {HTML} at (0,0) size 800x436
     RenderBody {BODY} at (8,16) size 784x0
       RenderBlock {UL} at (0,0) size 784x0
         RenderBlock (floating) {LI} at (45,5) size 130x130 [bgcolor=#008000]
@@ -16,7 +16,3 @@ layer at (0,0) size 800x576
         RenderBlock (floating) {LI} at (605,145) size 130x130 [bgcolor=#008000]
         RenderBlock (floating) {LI} at (45,285) size 130x130 [bgcolor=#008000]
         RenderBlock (floating) {LI} at (185,285) size 130x130 [bgcolor=#008000]
-        RenderBlock (floating) {LI} at (325,285) size 130x130 [bgcolor=#008000]
-        RenderBlock (floating) {LI} at (465,285) size 130x130 [bgcolor=#008000]
-        RenderBlock (floating) {LI} at (605,285) size 130x130 [bgcolor=#008000]
-        RenderBlock (floating) {LI} at (45,425) size 130x130 [bgcolor=#008000]
index f7edb9e..11b0912 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-image-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-image-expected.png differ
index ad23f28..bc7c007 100644 (file)
@@ -1,7 +1,7 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
-layer at (0,0) size 800x576
-  RenderBlock {HTML} at (0,0) size 800x576
+layer at (0,0) size 800x436
+  RenderBlock {HTML} at (0,0) size 800x436
     RenderBody {BODY} at (8,16) size 784x0
       RenderBlock {UL} at (0,0) size 784x0
         RenderBlock (floating) {LI} at (45,5) size 130x130
@@ -15,9 +15,5 @@ layer at (0,0) size 800x576
         RenderBlock (floating) {LI} at (605,145) size 130x130
         RenderBlock (floating) {LI} at (45,285) size 130x130
         RenderBlock (floating) {LI} at (185,285) size 130x130
-        RenderBlock (floating) {LI} at (325,285) size 130x130
-        RenderBlock (floating) {LI} at (465,285) size 130x130
-        RenderBlock (floating) {LI} at (605,285) size 130x130
-        RenderBlock (floating) {LI} at (45,425) size 130x130
 layer at (473,21) size 130x130
   RenderBlock (floating) {LI} at (465,5) size 130x130
index d7b8e3b..f546c0e 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png differ
index 75b8d6f..83b436e 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-multiple-background-layers-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-multiple-background-layers-expected.png differ
index 9312cb2..9408814 100644 (file)
Binary files a/LayoutTests/platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png and b/LayoutTests/platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png differ
index 74cf0a9..3a245de 100644 (file)
@@ -1,3 +1,16 @@
+2014-05-02  Ion Rosca  <rosca@adobe.com>
+
+        [CSS Blending] Remove support for non-separable blend modes from background-blend-mode
+        https://bugs.webkit.org/show_bug.cgi?id=132327
+
+        Reviewed by Dean Jackson.
+
+        Removed support for non-separable background blend modes from the CSS parser.
+        Covered by existing tests.
+
+        * css/CSSParser.cpp:
+        (WebCore::CSSParser::parseFillProperty):
+
 2014-05-02  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 
         Clean up #include <OwnPtr.h>|<PassOwnPtr.h> in Supplementable classes
index 2f4d1ab..5a90add 100644 (file)
@@ -4307,8 +4307,7 @@ bool CSSParser::parseFillProperty(CSSPropertyID propId, CSSPropertyID& propId1,
                         || val->id == CSSValueScreen || val->id == CSSValueOverlay || val->id == CSSValueDarken
                         || val->id == CSSValueLighten ||  val->id == CSSValueColorDodge || val->id == CSSValueColorBurn
                         || val->id == CSSValueHardLight || val->id == CSSValueSoftLight || val->id == CSSValueDifference
-                        || val->id == CSSValueExclusion || val->id == CSSValueHue || val->id == CSSValueSaturation
-                        || val->id == CSSValueColor || val->id == CSSValueLuminosity)) {
+                        || val->id == CSSValueExclusion)) {
                         currValue = cssValuePool().createIdentifierValue(val->id);
                         m_valueList->next();
                     }