Changeset 168167 in webkit

Timestamp:

May 2, 2014 2:35:34 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Blending] Remove support for non-separable blend modes from background-blend-mode
​https://bugs.webkit.org/show_bug.cgi?id=132327

Patch by Ion Rosca <Ion Rosca> 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:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-gif-color-2.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-gif-color.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-gradient-color.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-gradient-gradient.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-gradient-image.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-image-color.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-image-image.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-image-svg.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-multiple-background-layers.html (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-property-expected.txt (modified) (1 diff)
• LayoutTests/css3/compositing/background-blend-mode-property-parsing-expected.txt (modified) (3 diffs)
• LayoutTests/css3/compositing/background-blend-mode-svg-color.html (modified) (1 diff)
• LayoutTests/css3/compositing/effect-background-blend-mode-tiled.html (modified) (1 diff)
• LayoutTests/css3/compositing/effect-background-blend-mode.html (modified) (1 diff)
• LayoutTests/css3/compositing/script-tests/background-blend-mode-property-parsing.js (modified) (1 diff)
• LayoutTests/css3/compositing/script-tests/background-blend-mode-property.js (modified) (1 diff)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-color-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-gradient-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-gradient-image-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-color-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-color-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-image-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-image-expected.txt (modified) (2 diffs)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-svg-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-multiple-background-layers-expected.png (modified) (previous)
• LayoutTests/platform/mac/css3/compositing/background-blend-mode-svg-color-expected.png (modified) (previous)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSParser.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+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>
 

trunk/LayoutTests/css3/compositing/background-blend-mode-gif-color-2.html

@@ -35 +35 @@
     <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);

trunk/LayoutTests/css3/compositing/background-blend-mode-gif-color.html

@@ -25 +25 @@
     <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>

trunk/LayoutTests/css3/compositing/background-blend-mode-gradient-color.html

@@ -31 +31 @@
         <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>

trunk/LayoutTests/css3/compositing/background-blend-mode-gradient-gradient.html

@@ -31 +31 @@
         <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>

trunk/LayoutTests/css3/compositing/background-blend-mode-gradient-image.html

@@ -31 +31 @@
         <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>

trunk/LayoutTests/css3/compositing/background-blend-mode-image-color.html

@@ -27 +27 @@
         <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>

trunk/LayoutTests/css3/compositing/background-blend-mode-image-image.html

@@ -27 +27 @@
         <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>

trunk/LayoutTests/css3/compositing/background-blend-mode-image-svg.html

@@ -31 +31 @@
         <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>

trunk/LayoutTests/css3/compositing/background-blend-mode-multiple-background-layers.html

@@ -17 +17 @@
 <!-- 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>

trunk/LayoutTests/css3/compositing/background-blend-mode-property-expected.txt

@@ -40 +40 @@
 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
 

trunk/LayoutTests/css3/compositing/background-blend-mode-property-parsing-expected.txt

@@ -21 +21 @@
 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'
@@ -37 +37 @@
 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'
@@ -100 +100 @@
 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
 

trunk/LayoutTests/css3/compositing/background-blend-mode-svg-color.html

@@ -31 +31 @@
         <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>

trunk/LayoutTests/css3/compositing/effect-background-blend-mode-tiled.html

@@ -31 +31 @@
 <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>

trunk/LayoutTests/css3/compositing/effect-background-blend-mode.html

@@ -34 +34 @@
 <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>

trunk/LayoutTests/css3/compositing/script-tests/background-blend-mode-property-parsing.js

@@ -47 +47 @@
 }
 
-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)

trunk/LayoutTests/css3/compositing/script-tests/background-blend-mode-property.js

@@ -21 +21 @@
 }
 
-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)

trunk/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-2-expected.txt

@@ -15 +15 @@
       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]

trunk/LayoutTests/platform/mac/css3/compositing/background-blend-mode-gif-color-expected.txt

@@ -15 +15 @@
       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]

trunk/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-color-expected.txt

@@ -1 +1 @@
 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
@@ -17 +17 @@
         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]

trunk/LayoutTests/platform/mac/css3/compositing/background-blend-mode-image-image-expected.txt

@@ -1 +1 @@
 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
@@ -16 +16 @@
         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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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>
 

trunk/Source/WebCore/css/CSSParser.cpp

@@ -4308 +4308 @@
                         || 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();