Attachment 190604 Details for Bug 109464 – Patch

[patch] Patch

bug-109464-20130227143138.patch (text/plain), 22.83 KB, created by Michelangelo De Simone on 2013-02-27 14:35:24 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Michelangelo De Simone

Created: 2013-02-27 14:35:24 PST

Size: 22.83 KB

patch

obsolete

>Subversion Revision: 144216
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index c4f7dc8ae524ad631efc12154ad2def3da08883c..3375128764d88c512a6ebbe9203235cd00dcd115 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,26 @@
>+2013-02-27  Michelangelo De Simone  <michelangelo@webkit.org>
>+
>+        [CSS Shaders] Implement hue and saturation non-separable blend modes
>+        https://bugs.webkit.org/show_bug.cgi?id=109464
>+
>+        Added the following GLSL helper functions to the CustomFilterValidatedProgram:
>+
>+            - css_Sat(C): returns the saturation for the color C
>+            - css_SetSat(C, s): sets the saturation s on the color C
>+            - css_SetSatHelper(Cmin, Cmid, Cmax, s): helper function for css_SetSat
>+
>+        The above functions are being used for the "hue" and "saturation" non-separable
>+        blend modes, the relevant spec for such modes is at URL:
>+        https://dvcs.w3.org/hg/FXTF/rawfile/tip/compositing/index.html#blendingnonseparable
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Tests: css3/filters/custom/custom-filter-nonseparable-blend-mode-hue.html
>+               css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation.html
>+
>+        * platform/graphics/filters/CustomFilterValidatedProgram.cpp:
>+        (WebCore::CustomFilterValidatedProgram::blendFunctionString):
>+
> 2013-02-26  Alexey Proskuryakov  <ap@apple.com>
> 
>         Don't add a body to platform request until necessary
>diff --git a/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp b/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp
>index 58ebe34d96df64506a0d944aeccc4b829667c722..1a1843453c9afe732c96a9898bd5fa81c97b7716 100644
>--- a/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp
>+++ b/Source/WebCore/platform/graphics/filters/CustomFilterValidatedProgram.cpp
>@@ -292,6 +292,7 @@ String CustomFilterValidatedProgram::blendFunctionString(BlendMode blendMode)
>     const char* blendColorExpression = "vec3(css_BlendComponent(Cb.r, Cs.r), css_BlendComponent(Cb.g, Cs.g), css_BlendComponent(Cb.b, Cs.b))";
>     const char* blendComponentExpression = "Co = 0.0;";
>     bool needsLuminosityHelperFunctions = false;
>+    bool needsSaturationHelperFunctions = false;
>     String blendFunctionString;
>     switch (blendMode) {
>     case BlendModeNormal:
>@@ -416,9 +417,17 @@ String CustomFilterValidatedProgram::blendFunctionString(BlendMode blendMode)
>         blendColorExpression = "css_SetLum(Cb, css_Lum(Cs))";
>         break;
>     case BlendModeHue:
>+        needsLuminosityHelperFunctions = true;
>+        needsSaturationHelperFunctions = true;
>+        blendColorExpression = "css_SetLum(css_SetSat(Cs, css_Sat(Cb)), css_Lum(Cb))";
>+        break;
>     case BlendModeSaturation:
>-        notImplemented();
>-        return String();
>+        needsLuminosityHelperFunctions = true;
>+        needsSaturationHelperFunctions = true;
>+        blendColorExpression = "css_SetLum(css_SetSat(Cb, css_Sat(Cs)), css_Lum(Cb))";
>+        break;
>+    default:
>+        ASSERT_NOT_REACHED();
>     }
> 
>     if (needsLuminosityHelperFunctions) {
>@@ -446,6 +455,49 @@ String CustomFilterValidatedProgram::blendFunctionString(BlendMode blendMode)
>         ));
>     }
> 
>+    if (needsSaturationHelperFunctions) {
>+        blendFunctionString.append(SHADER(
>+            mediump float css_Sat(mediump vec3 C)
>+            {
>+                mediump float cMin = min(min(C.r, C.g), C.b);
>+                mediump float cMax = max(max(C.r, C.g), C.b);
>+                return cMax - cMin;
>+            }
>+            void css_SetSatHelper(inout mediump float cMin, inout mediump float cMid, inout mediump float cMax, mediump float s)
>+            {
>+                if (cMax > cMin) {
>+                    cMid = (((cMid - cMin) * s) / (cMax - cMin));
>+                    cMax = s;
>+                } else
>+                    cMid = cMax = 0.0;
>+                cMin = 0.0;
>+            }
>+            mediump vec3 css_SetSat(mediump vec3 C, mediump float s)
>+            {
>+                if (C.r <= C.g) {
>+                    if (C.g <= C.b)
>+                        css_SetSatHelper(C.r, C.g, C.b, s);
>+                    else {
>+                        if (C.r <= C.b)
>+                            css_SetSatHelper(C.r, C.b, C.g, s);
>+                        else
>+                            css_SetSatHelper(C.b, C.r, C.g, s);
>+                    }
>+                } else {
>+                    if (C.r <= C.b)
>+                        css_SetSatHelper(C.g, C.r, C.b, s);
>+                    else {
>+                        if (C.g <= C.b)
>+                            css_SetSatHelper(C.g, C.b, C.r, s);
>+                        else
>+                            css_SetSatHelper(C.b, C.g, C.r, s);
>+                    }
>+                }
>+                return C;
>+            }
>+        ));
>+    }
>+
>     blendFunctionString.append(String::format(SHADER(
>         mediump float css_BlendComponent(mediump float Cb, mediump float Cs)
>         {
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index f8410e54121aea0b0b2fa97e2b119f502e48aa3d..c522fb2306eecd3ec9413ec8f84f01c3a0df9b02 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,19 @@
>+2013-02-27  Michelangelo De Simone  <michelangelo@webkit.org>
>+
>+        [CSS Shaders] Implement hue and saturation non-separable blend modes
>+        https://bugs.webkit.org/show_bug.cgi?id=109464
>+
>+        Added relevant tests for the "hue" and "saturation" non-separable blend modes.
>+        These tests are currently skipped on Mac due to a slight color difference; please see relevant bug: http://webkit.org/b/107487.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * css3/filters/custom/custom-filter-nonseparable-blend-mode-hue-expected.html: Added.
>+        * css3/filters/custom/custom-filter-nonseparable-blend-mode-hue.html: Added.
>+        * css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation-expected.html: Added.
>+        * css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation.html: Added.
>+        * platform/mac/TestExpectations:
>+
> 2013-02-27  Stephen Chenney  <schenney@chromium.org>
> 
>         [Chromium] Test expectations updates
>diff --git a/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-hue-expected.html b/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-hue-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..3f17f87aa67920eb2aff2a0a4b4528419c8457b4
>--- /dev/null
>+++ b/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-hue-expected.html
>@@ -0,0 +1,36 @@
>+<!DOCTYPE HTML>
>+<html lang="en">
>+<head>
>+    <title>Test that blends the source and the backdrop with the hue blend mode.</title>
>+    <style type="text/css">
>+        /* These are exactly the color values we expect. Some platforms may have slight different
>+           color result. */
>+        #solid-solid {
>+            background-color: rgb(108, 157, 255);
>+            width: 100px;
>+            height: 100px;
>+        }
>+        #alpha-solid {
>+            background-color: rgb(167, 192, 242);
>+            width: 100px;
>+            height: 100px;
>+        }
>+        #solid-alpha {
>+            background-color: rgb(169, 142, 166);
>+            width: 100px;
>+            height: 100px;
>+        }
>+        #alpha-alpha {
>+            background-color: rgb(205, 192, 204);
>+            width: 100px;
>+            height: 100px;
>+        }
>+    </style>
>+</head>
>+<body>
>+    <div id="solid-solid"></div>
>+    <div id="alpha-solid"></div>
>+    <div id="solid-alpha"></div>
>+    <div id="alpha-alpha"></div>
>+</body>
>+</html>
>diff --git a/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-hue.html b/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-hue.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..2ea0d8c2b9caa1bb4d8d41f6878f6d9407a3b816
>--- /dev/null
>+++ b/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-hue.html
>@@ -0,0 +1,151 @@
>+<!DOCTYPE HTML>
>+<html lang="en">
>+<head>
>+    <title>Test that blends the source and the backdrop with the hue blend mode.</title>
>+    <script>
>+        if (window.testRunner) {
>+            window.testRunner.overridePreference("WebKitCSSCustomFilterEnabled", "1");
>+            window.testRunner.overridePreference("WebKitWebGLEnabled", "1");
>+        }
>+    </script>
>+    <style type="text/css">
>+        #solid-solid {
>+            background-color: rgb(90%, 50%, 30%);
>+            width: 100px;
>+            height: 100px;
>+            -webkit-filter: custom(none mix(url('../resources/mix-color.fs') hue source-atop), mix_color 0.2 0.4 0.8 1.0);
>+        }
>+        #alpha-solid {
>+            background-color: rgba(90%, 50%, 30%, 0.5);
>+            width: 100px;
>+            height: 100px;
>+            -webkit-filter: custom(none mix(url('../resources/mix-color.fs') hue source-atop), mix_color 0.2 0.4 0.8 1.0);
>+        }
>+        #solid-alpha {
>+            background-color: rgb(90%, 50%, 30%);
>+            width: 100px;
>+            height: 100px;
>+            -webkit-filter: custom(none mix(url('../resources/mix-color.fs') hue source-atop), mix_color 0.2 0.4 0.8 0.5);
>+        }
>+        #alpha-alpha {
>+            background-color: rgba(90%, 50%, 30%, 0.5);
>+            width: 100px;
>+            height: 100px;
>+            -webkit-filter: custom(none mix(url('../resources/mix-color.fs') hue source-atop), mix_color 0.2 0.4 0.8 0.5);
>+        }
>+    </style>
>+</head>
>+<body>
>+
>+    <div id="solid-solid"></div>
>+    <div id="alpha-solid"></div>
>+    <div id="solid-alpha"></div>
>+    <div id="alpha-alpha"></div>
>+</body>
>+</html>
>diff --git a/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation-expected.html b/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation-expected.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..01d49c82b0aa3221e2c1450dbc2a092d6eea74b4
>--- /dev/null
>+++ b/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation-expected.html
>@@ -0,0 +1,36 @@
>+<!DOCTYPE HTML>
>+<html lang="en">
>+<head>
>+    <title>Test that blends the source and the backdrop with the saturation blend mode.</title>
>+    <style type="text/css">
>+        /* These are exactly the color values we expect. Some platforms may have slight different
>+           color result. */
>+        #solid-solid {
>+            background-color: rgb(191, 141, 115);
>+            width: 100px;
>+            height: 100px;
>+        }
>+        #alpha-solid {
>+            background-color: rgb(198, 185, 198);
>+            width: 100px;
>+            height: 100px;
>+        }
>+        #solid-alpha {
>+            background-color: rgb(230, 128, 76);
>+            width: 100px;
>+            height: 100px;
>+        }
>+        #alpha-alpha {
>+            background-color: rgb(220, 189, 182);
>+            width: 100px;
>+            height: 100px;
>+        }
>+    </style>
>+</head>
>+<body>
>+    <div id="solid-solid"></div>
>+    <div id="alpha-solid"></div>
>+    <div id="solid-alpha"></div>
>+    <div id="alpha-alpha"></div>
>+</body>
>+</html>
>diff --git a/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation.html b/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation.html
>new file mode 100644
>index 0000000000000000000000000000000000000000..ea18bb1be8c8cd07347e24bc10a1104416108279
>--- /dev/null
>+++ b/LayoutTests/css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation.html
>@@ -0,0 +1,137 @@
>+<!DOCTYPE HTML>
>+<html lang="en">
>+<head>
>+    <title>Test that blends the source and the backdrop with the saturation blend mode.</title>
>+    <script>
>+        if (window.testRunner) {
>+            window.testRunner.overridePreference("WebKitCSSCustomFilterEnabled", "1");
>+            window.testRunner.overridePreference("WebKitWebGLEnabled", "1");
>+        }
>+    </script>
>+    <style type="text/css">
>+        #solid-solid {
>+            background-color: rgb(90%, 50%, 30%);
>+            width: 100px;
>+            height: 100px;
>+            -webkit-filter: custom(none mix(url('../resources/mix-color.fs') saturation source-atop), mix_color 0.1 0.2 0.4 1.0);
>+        }
>+        #alpha-solid {
>+            background-color: rgba(90%, 50%, 30%, 0.5);
>+            width: 100px;
>+            height: 100px;
>+            -webkit-filter: custom(none mix(url('../resources/mix-color.fs') saturation source-atop), mix_color 0.2 0.4 0.8 1.0);
>+        }
>+        #solid-alpha {
>+            background-color: rgb(90%, 50%, 30%);
>+            width: 100px;
>+            height: 100px;
>+            -webkit-filter: custom(none mix(url('../resources/mix-color.fs') saturation source-atop), mix_color 0.2 0.4 0.8 0.5);
>+        }
>+        #alpha-alpha {
>+            background-color: rgba(90%, 50%, 30%, 0.5);
>+            width: 100px;
>+            height: 100px;
>+            -webkit-filter: custom(none mix(url('../resources/mix-color.fs') saturation source-atop), mix_color 0.2 0.4 0.8 0.5);
>+        }
>+    </style>
>+</head>
>+<body>
>+
>+    <div id="solid-solid"></div>
>+    <div id="alpha-solid"></div>
>+    <div id="solid-alpha"></div>
>+    <div id="alpha-alpha"></div>
>+</body>
>+</html>
>diff --git a/LayoutTests/platform/mac/TestExpectations b/LayoutTests/platform/mac/TestExpectations
>index 8d9c49ff0ff6e76f7130adbd12b0170fbcf67df5..185f1ad40db80681bb455cc7a29f962b1b909aab 100644
>--- a/LayoutTests/platform/mac/TestExpectations
>+++ b/LayoutTests/platform/mac/TestExpectations
>@@ -953,11 +953,13 @@ fast/canvas/canvas-quadratic-same-endpoint.html
> css3/filters/composited-during-transition-layertree.html
> 
> # --- Custom Filters ---
>-# The following 3 tests are currently skipped on Mac for slight color differences,
>+# The following 5 tests are currently skipped on Mac for slight color differences,
> # please see the relevant bug: http://webkit.org/b/107487
> webkit.org/b/107487 css3/filters/custom/custom-filter-blend-fractional-destination-alpha.html [ Skip ]
> webkit.org/b/107487 css3/filters/custom/custom-filter-nonseparable-blend-mode-color.html [ Skip ]
> webkit.org/b/107487 css3/filters/custom/custom-filter-nonseparable-blend-mode-luminosity.html [ Skip ]
>+webkit.org/b/107487 css3/filters/custom/custom-filter-nonseparable-blend-mode-hue.html [ Skip ]
>+webkit.org/b/107487 css3/filters/custom/custom-filter-nonseparable-blend-mode-saturation.html [ Skip ]
> 
> # --- Text ---
> fast/forms/text-control-intrinsic-widths.html

Actions: View | Formatted Diff | Diff

Attachments on bug 109464: 190604 | 191059