Changeset 87547 in webkit

Timestamp:

May 27, 2011 1:29:12 PM (13 years ago)

Author:

jamesr@google.com

Message:

2011-05-27 James Robinson <​jamesr@chromium.org>

Reviewed by Simon Fraser.

GraphicsLayers for overflow controls on iframe without clipping layer left out of layer tree
​https://bugs.webkit.org/show_bug.cgi?id=61590

• compositing/iframes/resizer-expected.txt: Added.
• compositing/iframes/resizer.html: Added.

2011-05-27 James Robinson <​jamesr@chromium.org>

Reviewed by Simon Fraser.

GraphicsLayers for overflow controls on iframe without clipping layer left out of layer tree
​https://bugs.webkit.org/show_bug.cgi?id=61590

Adds overflow control layers to the compositor tree for layers without clipping layers regardless of whether the
backing is parented. This ensures that the scroll corner layer for an iframe without a clipping layer ends up
in the final layer tree. We don't currently render resizers for iframes, but we will soon and this keeps the
graphics layer tree consistent.

Test: compositing/iframes/resizer.html

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/compositing/iframes/resizer.html (added)
• LayoutTests/platform/chromium-gpu/compositing/iframes/resizer-expected.txt (added)
• LayoutTests/platform/mac/compositing/iframes/resizer-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/rendering/RenderLayerCompositor.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-27  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        GraphicsLayers for overflow controls on iframe without clipping layer left out of layer tree
+        https://bugs.webkit.org/show_bug.cgi?id=61590
+
+        * compositing/iframes/resizer-expected.txt: Added.
+        * compositing/iframes/resizer.html: Added.
+
 2011-05-27  Nikolas Zimmermann  <nzimmermann@rim.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-27  James Robinson  <jamesr@chromium.org>
+
+        Reviewed by Simon Fraser.
+
+        GraphicsLayers for overflow controls on iframe without clipping layer left out of layer tree
+        https://bugs.webkit.org/show_bug.cgi?id=61590
+
+        Adds overflow control layers to the compositor tree for layers without clipping layers regardless of whether the
+        backing is parented.  This ensures that the scroll corner layer for an iframe without a clipping layer ends up
+        in the final layer tree.  We don't currently render resizers for iframes, but we will soon and this keeps the
+        graphics layer tree consistent.
+
+        Test: compositing/iframes/resizer.html
+
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::rebuildCompositingLayerTree):
+
 2011-05-27  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -859 +859 @@
             parented = parentFrameContentLayers(toRenderPart(layer->renderer()));
 
+        if (!parented)
+            layerBacking->parentForSublayers()->setChildren(layerChildren);
+
         // If the layer has a clipping layer the overflow controls layers will be siblings of the clipping layer.
         // Otherwise, the overflow control layers are normal children.
@@ -864 +867 @@
             if (GraphicsLayer* overflowControlLayer = layerBacking->layerForHorizontalScrollbar()) {
                 overflowControlLayer->removeFromParent();
-                layerChildren.append(overflowControlLayer);
+                layerBacking->parentForSublayers()->addChild(overflowControlLayer);
             }
 
             if (GraphicsLayer* overflowControlLayer = layerBacking->layerForVerticalScrollbar()) {
                 overflowControlLayer->removeFromParent();
-                layerChildren.append(overflowControlLayer);
+                layerBacking->parentForSublayers()->addChild(overflowControlLayer);
             }
 
             if (GraphicsLayer* overflowControlLayer = layerBacking->layerForScrollCorner()) {
                 overflowControlLayer->removeFromParent();
-                layerChildren.append(overflowControlLayer);
+                layerBacking->parentForSublayers()->addChild(overflowControlLayer);
             }
         }
-
-        if (!parented)
-            layerBacking->parentForSublayers()->setChildren(layerChildren);
 
 #if ENABLE(FULLSCREEN_API)