Changeset 106319 in webkit

Timestamp:

Jan 30, 2012 6:58:27 PM (12 years ago)

Author:

andersca@apple.com

Message:

Simplify RenderLayerCompositor::frameViewDidScroll
​https://bugs.webkit.org/show_bug.cgi?id=77398

Reviewed by Sam Weinig.

Remove the scrollPosition parameter from RenderLayerCompositor::frameViewDidScroll; we can just get it
from the associated FrameView object.

• page/FrameView.cpp:

(WebCore::FrameView::scrollPositionChanged):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::frameViewDidChangeSize):
Call frameViewDidScroll() here instead of setting the scroll layer position explicitly.

(WebCore::RenderLayerCompositor::frameViewDidScroll):
(WebCore::RenderLayerCompositor::ensureRootLayer):

• rendering/RenderLayerCompositor.h:

(RenderLayerCompositor):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (3 diffs)
• rendering/RenderLayerCompositor.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-30  Anders Carlsson  <andersca@apple.com>
+
+        Simplify RenderLayerCompositor::frameViewDidScroll
+        https://bugs.webkit.org/show_bug.cgi?id=77398
+
+        Reviewed by Sam Weinig.
+
+        Remove the scrollPosition parameter from RenderLayerCompositor::frameViewDidScroll; we can just get it
+        from the associated FrameView object.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scrollPositionChanged):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::frameViewDidChangeSize):
+        Call frameViewDidScroll() here instead of setting the scroll layer position explicitly.
+
+        (WebCore::RenderLayerCompositor::frameViewDidScroll):
+        (WebCore::RenderLayerCompositor::ensureRootLayer):
+        * rendering/RenderLayerCompositor.h:
+        (RenderLayerCompositor):
+
 2012-01-30  Pablo Flouret  <pablof@motorola.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1730 +1730 @@
     if (RenderView* root = rootRenderer(this)) {
         if (root->usesCompositing())
-            root->compositor()->frameViewDidScroll(scrollPosition());
+            root->compositor()->frameViewDidScroll();
     }
 #endif

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -965 +965 @@
         m_clipLayer->setSize(frameView->visibleContentRect(false /* exclude scrollbars */).size());
 
-        LayoutPoint scrollPosition = frameView->scrollPosition();
-        m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y()));
+        frameViewDidScroll();
         updateOverflowControlsLayers();
 
@@ -981 +980 @@
 }
 
-void RenderLayerCompositor::frameViewDidScroll(const LayoutPoint& scrollPosition)
-{
+void RenderLayerCompositor::frameViewDidScroll()
+{
+    FrameView* frameView = m_renderView->frameView();
+    LayoutPoint scrollPosition = frameView->scrollPosition();
+
     if (m_scrollLayer)
         m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y()));
@@ -1868 +1870 @@
 
             frameViewDidChangeSize();
-            frameViewDidScroll(m_renderView->frameView()->scrollPosition());
+            frameViewDidScroll();
 
 #if ENABLE(THREADED_SCROLLING)

trunk/Source/WebCore/rendering/RenderLayerCompositor.h

@@ -188 +188 @@
     void frameViewDidChangeLocation(const LayoutPoint& contentsOffset);
     void frameViewDidChangeSize();
-    void frameViewDidScroll(const LayoutPoint& = LayoutPoint());
+    void frameViewDidScroll();
 
     String layerTreeAsText(bool showDebugInfo = false);