commit 2d3dba2e151d04868ad380bc87a794492b74af92
author simon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Jul 12 22:21:29 2011 +0000
committer simon.fraser@apple.com <simon.fraser@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Jul 12 22:21:29 2011 +0000
tree 53b85122c99c4ba123aa2edde7e0e3874d059430
parent 40232e204630d8d1e5a139073d1e99c1247b8ca5

2011-07-12  Simon Fraser  <simon.fraser@apple.com>

        Clean up some RenderLayerCompositor code relating to scroll and root layers
        https://bugs.webkit.org/show_bug.cgi?id=64400

        Reviewed by James Robinson.

        There was no need for FrameView::syncCompositingStateForThisFrame()
        to call syncCompositingStateForThisLayerOnly() on the various
        scrollbar-related layers, because the subsequent call to
        compositor()->flushPendingLayerChanges() starts to flush at
        m_overflowControlsHostLayer if one exists, and its an ancestor
        of the scrollbar layers.

        Also clean up terminology in RenderLayerCompositor.
            m_rootPlatformLayer -> m_rootContentLayer
            rootPlatformLayer() -> rootGraphicsLayer()

        No behavior change, so no new tests.

        * page/FrameView.cpp:
        (WebCore::FrameView::syncCompositingStateForThisFrame):
        * rendering/RenderLayerCompositor.cpp:
        (WebCore::RenderLayerCompositor::enableCompositingMode):
        (WebCore::RenderLayerCompositor::flushPendingLayerChanges):
        (WebCore::RenderLayerCompositor::updateCompositingLayers):
        (WebCore::RenderLayerCompositor::layerTreeAsText):
        (WebCore::RenderLayerCompositor::parentFrameContentLayers):
        (WebCore::RenderLayerCompositor::rootGraphicsLayer):
        (WebCore::RenderLayerCompositor::didMoveOnscreen):
        (WebCore::RenderLayerCompositor::willMoveOffscreen):
        (WebCore::RenderLayerCompositor::updateRootLayerPosition):
        (WebCore::RenderLayerCompositor::ensureRootLayer):
        (WebCore::RenderLayerCompositor::destroyRootLayer):
        (WebCore::RenderLayerCompositor::attachRootLayer):
        (WebCore::RenderLayerCompositor::detachRootLayer):
        (WebCore::RenderLayerCompositor::updateRootLayerAttachment):
        * rendering/RenderLayerCompositor.h:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@90860 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/rendering/RenderLayerCompositor.h

diff --git a/Source/WebCore/rendering/RenderLayerCompositor.h b/Source/WebCore/rendering/RenderLayerCompositor.h
index 0c946f4..1857a59 100644
--- a/Source/WebCore/rendering/RenderLayerCompositor.h
+++ b/Source/WebCore/rendering/RenderLayerCompositor.h
@@ -133,7 +133,7 @@
     void repaintCompositedLayersAbsoluteRect(const IntRect&);
 
     RenderLayer* rootRenderLayer() const;
-    GraphicsLayer* rootPlatformLayer() const;
+    GraphicsLayer* rootGraphicsLayer() const;
 
     enum RootLayerAttachment {
         RootLayerUnattached,
@@ -239,11 +239,11 @@
     bool layerHas3DContent(const RenderLayer*) const;
     bool hasNonIdentity3DTransform(RenderObject*) const;
 
-    void ensureRootPlatformLayer();
-    void destroyRootPlatformLayer();
+    void ensureRootLayer();
+    void destroyRootLayer();
 
-    void attachRootPlatformLayer(RootLayerAttachment);
-    void detachRootPlatformLayer();
+    void attachRootLayer(RootLayerAttachment);
+    void detachRootLayer();
     
     void rootLayerAttachmentChanged();
 
@@ -268,7 +268,7 @@
 
 private:
     RenderView* m_renderView;
-    OwnPtr<GraphicsLayer> m_rootPlatformLayer;
+    OwnPtr<GraphicsLayer> m_rootContentLayer;
     Timer<RenderLayerCompositor> m_updateCompositingLayersTimer;
 
     bool m_hasAcceleratedCompositing;