Changeset 125629 in webkit

Timestamp:

Aug 14, 2012 6:21:47 PM (12 years ago)

Author:

Alexandru Chiculita

Message:

[CSS Shaders][Chromium] Filters area applied twice when CustomFilterOperation is in the list
​https://bugs.webkit.org/show_bug.cgi?id=93900

Reviewed by James Robinson.

Source/WebCore:

Whenever the platform cannot render a shader in hardware it will fallback to software.
In such cases, the platform should remove any old filters applied, so that the filters do not apply twice.

Test: css3/filters/custom/filter-fallback-to-software.html

• platform/graphics/chromium/GraphicsLayerChromium.cpp:

(WebCore::GraphicsLayerChromium::setFilters):

LayoutTests:

Added a test that first applies a blur and then switches to a CSS Shader plus a blur.
The test was failing on Chromium by not removing the old blur filter from the platform layer.

• css3/filters/custom/filter-fallback-to-software-expected.html: Added.
• css3/filters/custom/filter-fallback-to-software.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/custom/filter-fallback-to-software-expected.html (added)
• LayoutTests/css3/filters/custom/filter-fallback-to-software.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-08-14  Alexandru Chiculita  <achicu@adobe.com>
+
+        [CSS Shaders][Chromium] Filters area applied twice when CustomFilterOperation is in the list
+        https://bugs.webkit.org/show_bug.cgi?id=93900
+
+        Reviewed by James Robinson.
+
+        Added a test that first applies a blur and then switches to a CSS Shader plus a blur.
+        The test was failing on Chromium by not removing the old blur filter from the platform layer.
+
+        * css3/filters/custom/filter-fallback-to-software-expected.html: Added.
+        * css3/filters/custom/filter-fallback-to-software.html: Added.
+
 2012-08-14  Adrienne Walker  <enne@google.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-08-14  Alexandru Chiculita  <achicu@adobe.com>
+
+        [CSS Shaders][Chromium] Filters area applied twice when CustomFilterOperation is in the list
+        https://bugs.webkit.org/show_bug.cgi?id=93900
+
+        Reviewed by James Robinson.
+
+        Whenever the platform cannot render a shader in hardware it will fallback to software. 
+        In such cases, the platform should remove any old filters applied, so that the filters do not apply twice.
+        
+        Test: css3/filters/custom/filter-fallback-to-software.html
+
+        * platform/graphics/chromium/GraphicsLayerChromium.cpp:
+        (WebCore::GraphicsLayerChromium::setFilters):
+
 2012-08-14  Alec Flett  <alecflett@chromium.org>
 

trunk/Source/WebCore/platform/graphics/chromium/GraphicsLayerChromium.cpp

@@ -389 +389 @@
 {
     WebFilterOperations webFilters;
-    if (!copyWebCoreFilterOperationsToWebFilterOperations(filters, webFilters))
+    if (!copyWebCoreFilterOperationsToWebFilterOperations(filters, webFilters)) {
+        // Make sure the filters are removed from the platform layer, as they are
+        // going to fallback to software mode.
+        m_layer.setFilters(WebFilterOperations());
+        GraphicsLayer::setFilters(FilterOperations());
         return false;
+    }
     m_layer.setFilters(webFilters);
     return GraphicsLayer::setFilters(filters);