Changeset 105090 in webkit

Timestamp:

Jan 16, 2012 2:19:36 PM (12 years ago)

Author:

Simon Fraser

Message:

Filtered element with composited content beneath it must be composited
​https://bugs.webkit.org/show_bug.cgi?id=76322

Source/WebCore:

Reviewed by Dean Jackson.

If a RenderLayer has a filter effect, and a composited descendant, then
that layer must also be composited so that the filter is applied via
the compositing system, rather than via painting (otherwise the filter
will not affect the descendant).

Test: css3/filters/filtered-compositing-descendant.html

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::requiresCompositingWhenDescendantsAreCompositing):

LayoutTests:

Reviewed by Dean Jackson.

Testcase with a filtered element having a composited child.

• css3/filters/filtered-compositing-descendant-expected.png: Added.
• css3/filters/filtered-compositing-descendant-expected.txt: Added.
• css3/filters/filtered-compositing-descendant.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/css3/filters/filtered-compositing-descendant-expected.png (added)
• LayoutTests/css3/filters/filtered-compositing-descendant-expected.txt (added)
• LayoutTests/css3/filters/filtered-compositing-descendant.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-01-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Filtered element with composited content beneath it must be composited
+        https://bugs.webkit.org/show_bug.cgi?id=76322
+
+        Reviewed by Dean Jackson.
+        
+        Testcase with a filtered element having a composited child.
+
+        * css3/filters/filtered-compositing-descendant-expected.png: Added.
+        * css3/filters/filtered-compositing-descendant-expected.txt: Added.
+        * css3/filters/filtered-compositing-descendant.html: Added.
+
 2012-01-16  xueqing huang  <huangxueqing@baidu.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-16  Simon Fraser  <simon.fraser@apple.com>
+
+        Filtered element with composited content beneath it must be composited
+        https://bugs.webkit.org/show_bug.cgi?id=76322
+
+        Reviewed by Dean Jackson.
+        
+        If a RenderLayer has a filter effect, and a composited descendant, then
+        that layer must also be composited so that the filter is applied via
+        the compositing system, rather than via painting (otherwise the filter
+        will not affect the descendant).
+
+        Test: css3/filters/filtered-compositing-descendant.html
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresCompositingWhenDescendantsAreCompositing):
+
 2012-01-16  Andreas Kling  <awesomekling@apple.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1506 +1506 @@
 bool RenderLayerCompositor::requiresCompositingWhenDescendantsAreCompositing(RenderObject* renderer) const
 {
-    return renderer->hasTransform() || renderer->isTransparent() || renderer->hasMask() || renderer->hasReflection();
+    return renderer->hasTransform() || renderer->isTransparent() || renderer->hasMask() || renderer->hasReflection() || renderer->hasFilter();
 }