Changeset 103426 in webkit

Timestamp:

Dec 21, 2011 11:52:57 AM (12 years ago)

Author:

andersca@apple.com

Message:

ScrollingCoordinator functions should take FrameView objects
​https://bugs.webkit.org/show_bug.cgi?id=75023

Reviewed by Sam Weinig.

• page/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::syncFrameViewGeometry):

• page/ScrollingCoordinator.h:
• page/mac/ScrollingCoordinatorMac.mm:

(WebCore::ScrollingCoordinator::setFrameViewScrollLayer):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::frameViewDidChangeSize):
(WebCore::RenderLayerCompositor::updateRootLayerPosition):
(WebCore::RenderLayerCompositor::ensureRootLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/ScrollingCoordinator.cpp (modified) (1 diff)
• page/ScrollingCoordinator.h (modified) (2 diffs)
• page/mac/ScrollingCoordinatorMac.mm (modified) (2 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-21  Anders Carlsson  <andersca@apple.com>
+
+        ScrollingCoordinator functions should take FrameView objects
+        https://bugs.webkit.org/show_bug.cgi?id=75023
+
+        Reviewed by Sam Weinig.
+
+        * page/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::syncFrameViewGeometry):
+        * page/ScrollingCoordinator.h:
+        * page/mac/ScrollingCoordinatorMac.mm:
+        (WebCore::ScrollingCoordinator::setFrameViewScrollLayer):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::frameViewDidChangeSize):
+        (WebCore::RenderLayerCompositor::updateRootLayerPosition):
+        (WebCore::RenderLayerCompositor::ensureRootLayer):
+
 2011-12-21  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/page/ScrollingCoordinator.cpp

@@ -63 +63 @@
 }
 
-void ScrollingCoordinator::syncFrameGeometry(Frame* frame)
+void ScrollingCoordinator::syncFrameViewGeometry(FrameView* frameView)
 {
     ASSERT(isMainThread());
     ASSERT(m_page);
 
-    if (frame != m_page->mainFrame())
+    if (frameView->frame() != m_page->mainFrame())
         return;
 
-    IntRect visibleContentRect = frame->view()->visibleContentRect();
-    IntSize contentsSize = frame->view()->contentsSize();
+    IntRect visibleContentRect = frameView->visibleContentRect();
+    IntSize contentsSize = frameView->contentsSize();
 
     MutexLocker locker(m_mainFrameGeometryMutex);

trunk/Source/WebCore/page/ScrollingCoordinator.h

@@ -41 +41 @@
 namespace WebCore {
 
-class Frame;
+class FrameView;
 class GraphicsLayer;
 class Page;
@@ -57 +57 @@
     void pageDestroyed();
 
-    // Should be called whenever the scroll layer for the given frame changes.
-    void setFrameScrollLayer(Frame*, const GraphicsLayer* scrollLayer);
+    // Should be called whenever the scroll layer for the given frame view changes.
+    void setFrameViewScrollLayer(FrameView*, const GraphicsLayer* scrollLayer);
 
-    // Should be called whenever the geometry of the given frame changes,
+    // Should be called whenever the geometry of the given frame view changes,
     // including the visible content rect and the content size.
-    void syncFrameGeometry(Frame*);
+    void syncFrameViewGeometry(FrameView*);
 
     // Can be called from any thread. Will try to handle the wheel event on the scrolling thread,

trunk/Source/WebCore/page/mac/ScrollingCoordinatorMac.mm

@@ -30 +30 @@
 #import "ScrollingCoordinator.h"
 
+#import "FrameView.h"
 #import "Page.h"
 #import <QuartzCore/QuartzCore.h>
@@ -161 +162 @@
 }
 
-void ScrollingCoordinator::setFrameScrollLayer(Frame* frame, const GraphicsLayer* scrollLayer)
+void ScrollingCoordinator::setFrameViewScrollLayer(FrameView* frameView, const GraphicsLayer* scrollLayer)
 {
     ASSERT(isMainThread());
     ASSERT(m_page);
 
-    if (frame != m_page->mainFrame())
+    if (frameView->frame() != m_page->mainFrame())
         return;
 

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -974 +974 @@
 #if ENABLE(THREADED_SCROLLING)
         if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-            scrollingCoordinator->syncFrameGeometry(frameView->frame());
+            scrollingCoordinator->syncFrameViewGeometry(frameView);
 #endif
     }
@@ -1232 +1232 @@
 #if ENABLE(THREADED_SCROLLING)
     if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-        scrollingCoordinator->syncFrameGeometry(m_renderView->frameView()->frame());
+        scrollingCoordinator->syncFrameViewGeometry(m_renderView->frameView());
 #endif
 }
@@ -1802 +1802 @@
 #if ENABLE(THREADED_SCROLLING)
             if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator())
-                scrollingCoordinator->setFrameScrollLayer(m_renderView->frameView()->frame(), m_scrollLayer.get());
+                scrollingCoordinator->setFrameViewScrollLayer(m_renderView->frameView(), m_scrollLayer.get());
 #endif
         }