Changeset 127517 in webkit

Timestamp:

Sep 4, 2012 3:53:25 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[CSS Shaders] Implement multiply, screen, darken, lighten, difference, exclusion blend modes.
​https://bugs.webkit.org/show_bug.cgi?id=93870

Patch by Max Vujovic <​mvujovic@adobe.com> on 2012-09-04
Reviewed by Dirk Schulze.

Source/WebCore:

Add expressions for the aforementioned blend modes. The expressions are lifted directly
from the CSS Compositing and Blending spec [1]. WebKit adds these blending expressions to
the author's shader.

[1]: ​https://dvcs.w3.org/hg/FXTF/rawfile/tip/compositing/index.html#blendingnormal

Test: css3/filters/custom/custom-filter-blend-modes.html

• platform/graphics/filters/CustomFilterValidatedProgram.cpp:

(WebCore::CustomFilterValidatedProgram::blendFunctionString):

LayoutTests:

Add test to check that the DOM element texture blends correctly with the css_MixColor
variable from the author's shader for each blend mode.

• css3/filters/custom/custom-filter-blend-modes-expected.html: Added.
• css3/filters/custom/custom-filter-blend-modes.html: Added.
• css3/filters/resources/mix-color.fs: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/custom/custom-filter-blend-modes-expected.html (added)
• LayoutTests/css3/filters/custom/custom-filter-blend-modes.html (added)
• LayoutTests/css3/filters/resources/mix-color.fs (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-04  Max Vujovic  <mvujovic@adobe.com>
+
+        [CSS Shaders] Implement multiply, screen, darken, lighten, difference, exclusion blend modes.
+        https://bugs.webkit.org/show_bug.cgi?id=93870
+
+        Reviewed by Dirk Schulze.
+
+        Add test to check that the DOM element texture blends correctly with the css_MixColor
+        variable from the author's shader for each blend mode.
+
+        * css3/filters/custom/custom-filter-blend-modes-expected.html: Added.
+        * css3/filters/custom/custom-filter-blend-modes.html: Added.
+        * css3/filters/resources/mix-color.fs: Added.
+
 2012-09-04  Jeffrey Pfau  <jpfau@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-04  Max Vujovic  <mvujovic@adobe.com>
+
+        [CSS Shaders] Implement multiply, screen, darken, lighten, difference, exclusion blend modes.
+        https://bugs.webkit.org/show_bug.cgi?id=93870
+
+        Reviewed by Dirk Schulze.
+
+        Add expressions for the aforementioned blend modes. The expressions are lifted directly
+        from the CSS Compositing and Blending spec [1]. WebKit adds these blending expressions to
+        the author's shader.
+
+        [1]: https://dvcs.w3.org/hg/FXTF/rawfile/tip/compositing/index.html#blendingnormal
+
+        Test: css3/filters/custom/custom-filter-blend-modes.html
+
+        * platform/graphics/filters/CustomFilterValidatedProgram.cpp:
+        (WebCore::CustomFilterValidatedProgram::blendFunctionString):
+
 2012-09-04  Nikhil Bhargava  <nbhargava@google.com>
 

trunk/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp

@@ -174 +174 @@
         break;
     case BlendModeMultiply:
+        expression = "Cs * Cb";
+        break;
     case BlendModeScreen:
+        expression = "Cb + Cs - (Cb * Cs)";
+        break;
+    case BlendModeDarken:
+        expression = "min(Cb, Cs)";
+        break;
+    case BlendModeLighten:
+        expression = "max(Cb, Cs)";
+        break;
+    case BlendModeDifference:
+        expression = "abs(Cb - Cs)";
+        break;
+    case BlendModeExclusion:
+        expression = "Cb + Cs - 2.0 * Cb * Cs";
+        break;
     case BlendModeOverlay:
-    case BlendModeDarken:
-    case BlendModeLighten:
     case BlendModeColorDodge:
     case BlendModeColorBurn:
     case BlendModeHardLight:
     case BlendModeSoftLight:
-    case BlendModeDifference:
-    case BlendModeExclusion:
     case BlendModeHue:
     case BlendModeSaturation: