Changeset 196571 in webkit

Timestamp:

Feb 14, 2016 9:10:58 PM (8 years ago)

Author:

Simon Fraser

Message:

[CSS Filters] When applying an SVG filter on a composited image using CSS the image is rendered without the filter
​https://bugs.webkit.org/show_bug.cgi?id=154108

Reviewed by Sam Weinig.
Source/WebCore:

When checking whether we can directly composite an image, we need to check for software-rendered
filters.

Test: compositing/filters/simple-image-with-svg-filter.html

• rendering/RenderLayerBacking.cpp:

(WebCore::RenderLayerBacking::isDirectlyCompositedImage):

LayoutTests:

• compositing/filters/simple-image-with-svg-filter-expected.html: Added.
• compositing/filters/simple-image-with-svg-filter.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/filters/simple-image-with-svg-filter-expected.html (added)
• LayoutTests/compositing/filters/simple-image-with-svg-filter.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerBacking.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-14  Simon Fraser  <simon.fraser@apple.com>
+
+        [CSS Filters] When applying an SVG filter on a composited image using CSS the image is rendered without the filter
+        https://bugs.webkit.org/show_bug.cgi?id=154108
+
+        Reviewed by Sam Weinig.
+
+        * compositing/filters/simple-image-with-svg-filter-expected.html: Added.
+        * compositing/filters/simple-image-with-svg-filter.html: Added.
+
 2016-02-14  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-02-14  Simon Fraser  <simon.fraser@apple.com>
+
+        [CSS Filters] When applying an SVG filter on a composited image using CSS the image is rendered without the filter
+        https://bugs.webkit.org/show_bug.cgi?id=154108
+
+        Reviewed by Sam Weinig.
+        
+        When checking whether we can directly composite an image, we need to check for software-rendered
+        filters.
+
+        Test: compositing/filters/simple-image-with-svg-filter.html
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::isDirectlyCompositedImage):
+
 2016-02-14  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -1996 +1996 @@
 bool RenderLayerBacking::isDirectlyCompositedImage() const
 {
-    if (!is<RenderImage>(renderer()) || m_owningLayer.hasBoxDecorationsOrBackground() || renderer().hasClip())
+    if (!is<RenderImage>(renderer()) || m_owningLayer.hasBoxDecorationsOrBackground() || m_owningLayer.paintsWithFilters() || renderer().hasClip())
         return false;