Changeset 155131 in webkit

Timestamp:

Sep 5, 2013, 10:56:58 AM (12 years ago)

Author:

Simon Fraser

Message:

Source/WebCore: Fix repaint issue on "paints into ancestor" filtered layers
​https://bugs.webkit.org/show_bug.cgi?id=120780

Reviewed by Tim Horton.

When a repaint happened on a layer with a filter, and which paints into
its compositing ancestor, we'd repaint the wrong layer (and assert).

Fix by ensuring that RenderLayer::enclosingFilterLayer() takes paintsIntoCompositedAncestor()
into account, by adding a function that we share between three callers who
check isComposited() && !paintsIntoCompositedAncestor(). I didn't use a function
on RenderLayer, because I wanted it to be inline but to not #include RenderLayerBacking
in RenderLayer.h.

Test: compositing/filters/opacity-change-on-filtered-paints-into-ancestor.html

• dom/Node.cpp: Drive-by removal of #include "RenderLayer.h"
• rendering/RenderLayer.cpp:

(WebCore::compositedWithOwnBackingStore):
(WebCore::RenderLayer::enclosingCompositingLayerForRepaint):
(WebCore::RenderLayer::enclosingFilterRepaintLayer):
(WebCore::RenderLayer::clippingRootForPainting):

LayoutTests: Fix repaint issue on "paints into ancestor" filtered layers
​https://bugs.webkit.org/show_bug.cgi?id=120780
<rdar://problem/14884148>

Reviewed by Tim Horton.

Ref test for opacity change on a filtered layer which paints into its compositing ancestor.

• compositing/filters/opacity-change-on-filtered-paints-into-ancestor-expected.html: Added.
• compositing/filters/opacity-change-on-filtered-paints-into-ancestor.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/filters/opacity-change-on-filtered-paints-into-ancestor-expected.html (added)
• LayoutTests/compositing/filters/opacity-change-on-filtered-paints-into-ancestor.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Node.cpp (modified) (1 diff)
• Source/WebCore/rendering/RenderLayer.cpp (modified) (5 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-09-05  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix repaint issue on "paints into ancestor" filtered layers
+        https://bugs.webkit.org/show_bug.cgi?id=120780
+        <rdar://problem/14884148>
+
+        Reviewed by Tim Horton.
+        
+        Ref test for opacity change on a filtered layer which paints into its compositing ancestor.
+
+        * compositing/filters/opacity-change-on-filtered-paints-into-ancestor-expected.html: Added.
+        * compositing/filters/opacity-change-on-filtered-paints-into-ancestor.html: Added.
+
 2013-09-05  Danilo Cesar Lemes de Paula  <danilo.cesar@collabora.co.uk>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-05  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix repaint issue on "paints into ancestor" filtered layers
+        https://bugs.webkit.org/show_bug.cgi?id=120780
+
+        Reviewed by Tim Horton.
+        
+        When a repaint happened on a layer with a filter, and which paints into
+        its compositing ancestor, we'd repaint the wrong layer (and assert).
+        
+        Fix by ensuring that RenderLayer::enclosingFilterLayer() takes paintsIntoCompositedAncestor()
+        into account, by adding a function that we share between three callers who
+        check isComposited() && !paintsIntoCompositedAncestor(). I didn't use a function
+        on RenderLayer, because I wanted it to be inline but to not #include RenderLayerBacking
+        in RenderLayer.h.
+
+        Test: compositing/filters/opacity-change-on-filtered-paints-into-ancestor.html
+
+        * dom/Node.cpp: Drive-by removal of #include "RenderLayer.h"
+        * rendering/RenderLayer.cpp: 
+        (WebCore::compositedWithOwnBackingStore):
+        (WebCore::RenderLayer::enclosingCompositingLayerForRepaint):
+        (WebCore::RenderLayer::enclosingFilterRepaintLayer):
+        (WebCore::RenderLayer::clippingRootForPainting):
+
 2013-09-05  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -118 +118 @@
 #include <wtf/text/StringBuilder.h>
 
-#ifndef NDEBUG
-#include "RenderLayer.h"
-#endif
-
 #if ENABLE(GESTURE_EVENTS)
 #include "GestureEvent.h"

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -1418 +1418 @@
 #if USE(ACCELERATED_COMPOSITING)
 
+static bool compositedWithOwnBackingStore(const RenderLayer* layer)
+{
+    return layer->isComposited() && !layer->backing()->paintsIntoCompositedAncestor();
+}
+
 RenderLayer* RenderLayer::enclosingCompositingLayer(IncludeSelfOrNot includeSelf) const
 {
@@ -1437 +1442 @@
 
     for (const RenderLayer* curr = compositingContainer(this); curr; curr = compositingContainer(curr)) {
-        if (curr->isComposited() && !curr->backing()->paintsIntoCompositedAncestor())
+        if (compositedWithOwnBackingStore(curr))
             return const_cast<RenderLayer*>(curr);
     }
@@ -1462 +1467 @@
 {
     for (const RenderLayer* curr = this; curr; curr = curr->parent()) {
-        if ((curr != this && curr->requiresFullLayerImageForFilters()) || curr->isComposited() || curr->isRootLayer())
+        if ((curr != this && curr->requiresFullLayerImageForFilters()) || compositedWithOwnBackingStore(curr) || curr->isRootLayer())
             return const_cast<RenderLayer*>(curr);
     }
@@ -1529 +1534 @@
 
 #endif
-    
+
 RenderLayer* RenderLayer::clippingRootForPainting() const
 {
@@ -1546 +1551 @@
         if (current->transform()
 #if USE(ACCELERATED_COMPOSITING)
-            || (current->isComposited() && !current->backing()->paintsIntoCompositedAncestor())
+            || compositedWithOwnBackingStore(current)
 #endif
         )