Changeset 88698 in webkit

Timestamp:

Jun 13, 2011 2:33:13 PM (13 years ago)

Author:

enne@google.com

Message:

2011-06-13 Adrienne Walker <​enne@google.com>

Reviewed by Simon Fraser.

Overlap test needs to consider children of composited layers
​https://bugs.webkit.org/show_bug.cgi?id=62465

• compositing/layer-creation/overlap-child-layer-expected.png: Added.
• compositing/layer-creation/overlap-child-layer-expected.txt: Added.
• compositing/layer-creation/overlap-child-layer.html: Added.

2011-06-13 Adrienne Walker <​enne@google.com>

Reviewed by Simon Fraser.

Overlap test needs to consider children of composited layers
​https://bugs.webkit.org/show_bug.cgi?id=62465

Any child layer with a compositing ancestor will be put into a
composited layer even though they themselves don't need compositing.
As layer bounds aren't hierarchical, these layer bounds themselves
need to be put into the overlap map because the composited layer
itself is not sufficient.

Test: compositing/layer-creation/overlap-animated-layer.html

• rendering/RenderLayerCompositor.cpp: (WebCore::RenderLayerCompositor::computeCompositingRequirements):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/layer-creation/overlap-child-layer-expected.png (added)
• LayoutTests/compositing/layer-creation/overlap-child-layer-expected.txt (added)
• LayoutTests/compositing/layer-creation/overlap-child-layer.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-13  Adrienne Walker  <enne@google.com>
+
+        Reviewed by Simon Fraser.
+
+        Overlap test needs to consider children of composited layers
+        https://bugs.webkit.org/show_bug.cgi?id=62465
+
+        * compositing/layer-creation/overlap-child-layer-expected.png: Added.
+        * compositing/layer-creation/overlap-child-layer-expected.txt: Added.
+        * compositing/layer-creation/overlap-child-layer.html: Added.
+
 2011-06-13  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-13  Adrienne Walker  <enne@google.com>
+
+        Reviewed by Simon Fraser.
+
+        Overlap test needs to consider children of composited layers
+        https://bugs.webkit.org/show_bug.cgi?id=62465
+
+        Any child layer with a compositing ancestor will be put into a
+        composited layer even though they themselves don't need compositing.
+        As layer bounds aren't hierarchical, these layer bounds themselves
+        need to be put into the overlap map because the composited layer
+        itself is not sufficient.
+
+        Test: compositing/layer-creation/overlap-animated-layer.html
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+
 2011-06-13  Xan Lopez  <xlopez@igalia.com>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -630 +630 @@
         // This layer now acts as the ancestor for kids.
         childState.m_compositingAncestor = layer;
-        if (overlapMap)
-            addToOverlapMap(*overlapMap, layer, absBounds, haveComputedBounds);
+    }
+
+    if (overlapMap && childState.m_compositingAncestor && !childState.m_compositingAncestor->isRootLayer()) {
+        addToOverlapMap(*overlapMap, layer, absBounds, haveComputedBounds);
     }