Changeset 270040 in webkit

Timestamp:

Nov 19, 2020 11:43:15 AM (3 years ago)

Author:

Fujii Hironori

Message:

[TextureMapperGL] The invert filter wrongly inverts pre-multiplied alpha color
​https://bugs.webkit.org/show_bug.cgi?id=219144

Reviewed by Carlos Garcia Campos.

Source/WebCore:

Test: compositing/filters/invert-transparent.html

• platform/graphics/texmap/TextureMapperShaderProgram.cpp: Take alpha value as an argument.

LayoutTests:

• compositing/filters/invert-transparent-expected.html: Added.
• compositing/filters/invert-transparent.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/filters/invert-transparent-expected.html (added)
• LayoutTests/compositing/filters/invert-transparent.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2020-11-19  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TextureMapperGL] The invert filter wrongly inverts pre-multiplied alpha color
+        https://bugs.webkit.org/show_bug.cgi?id=219144
+
+        Reviewed by Carlos Garcia Campos.
+
+        * compositing/filters/invert-transparent-expected.html: Added.
+        * compositing/filters/invert-transparent.html: Added.
+
 2020-11-19  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-11-19  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [TextureMapperGL] The invert filter wrongly inverts pre-multiplied alpha color
+        https://bugs.webkit.org/show_bug.cgi?id=219144
+
+        Reviewed by Carlos Garcia Campos.
+
+        Test: compositing/filters/invert-transparent.html
+
+        * platform/graphics/texmap/TextureMapperShaderProgram.cpp: Take alpha value as an argument.
+
 2020-11-19  Lauro Moura  <lmoura@igalia.com>
 

trunk/Source/WebCore/platform/graphics/texmap/TextureMapperShaderProgram.cpp

@@ -338 +338 @@
         }
 
-        float invert(float n) { return (1.0 - n) * u_filterAmount + n * (1.0 - u_filterAmount); }
+        float invert(float n, float a) { return (a - n) * u_filterAmount + n * (1.0 - u_filterAmount); }
         void applyInvertFilter(inout vec4 color)
         {
-            color = vec4(invert(color.r), invert(color.g), invert(color.b), color.a);
+            color = vec4(invert(color.r, color.a), invert(color.g, color.a), invert(color.b, color.a), color.a);
         }