Changeset 106750 in webkit

Timestamp:

Feb 4, 2012 4:43:39 PM (12 years ago)

Author:

andersca@apple.com

Message:

The scrolling tree should inform the main scrolling coordinator when the scroll position changes
​https://bugs.webkit.org/show_bug.cgi?id=77818

Reviewed by Sam Weinig.

• page/scrolling/ScrollingCoordinator.cpp:

(WebCore::ScrollingCoordinator::updateMainFrameScrollPosition):
Set the main frame scroll position.

• page/scrolling/ScrollingTree.cpp:

(WebCore::ScrollingTree::updateMainFrameScrollPosition):
Call ScrollingCoordinator::updateMainFrameScrollPosition on the main thread.

• page/scrolling/mac/ScrollingTreeNodeMac.mm:

(WebCore::ScrollingTreeNodeMac::scrollBy):
Call ScrollingTree::updateMainFrameScrollPosition.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingCoordinator.cpp (modified) (1 diff)
• page/scrolling/ScrollingCoordinator.h (modified) (1 diff)
• page/scrolling/ScrollingTree.cpp (modified) (2 diffs)
• page/scrolling/ScrollingTree.h (modified) (2 diffs)
• page/scrolling/mac/ScrollingTreeNodeMac.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-04  Anders Carlsson  <andersca@apple.com>
+
+        The scrolling tree should inform the main scrolling coordinator when the scroll position changes
+        https://bugs.webkit.org/show_bug.cgi?id=77818
+
+        Reviewed by Sam Weinig.
+
+        * page/scrolling/ScrollingCoordinator.cpp:
+        (WebCore::ScrollingCoordinator::updateMainFrameScrollPosition):
+        Set the main frame scroll position.
+
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::updateMainFrameScrollPosition):
+        Call ScrollingCoordinator::updateMainFrameScrollPosition on the main thread.
+
+        * page/scrolling/mac/ScrollingTreeNodeMac.mm:
+        (WebCore::ScrollingTreeNodeMac::scrollBy):
+        Call ScrollingTree::updateMainFrameScrollPosition.
+
 2012-02-04  Andreas Kling  <awesomekling@apple.com>
 

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp

@@ -105 +105 @@
 }
 
+void ScrollingCoordinator::updateMainFrameScrollPosition(const IntPoint& scrollPosition)
+{
+    ASSERT(isMainThread());
+
+    if (!m_page)
+        return;
+
+    FrameView* frameView = m_page->mainFrame()->view();
+    if (!frameView)
+        return;
+
+    frameView->setConstrainsScrollingToContentEdge(false);
+    frameView->scrollToOffsetWithoutAnimation(scrollPosition);
+    frameView->setConstrainsScrollingToContentEdge(true);
+}
+
 void ScrollingCoordinator::syncFrameViewGeometry(FrameView* frameView)
 {

trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.h

@@ -77 +77 @@
     void frameViewVerticalScrollbarLayerDidChange(FrameView*, GraphicsLayer* verticalScrollbarLayer);
 
+    // Dispatched by the scrolling tree whenever the main frame scroll position changes.
+    void updateMainFrameScrollPosition(const IntPoint&);
+
     // Should be called whenever the geometry of the given frame view changes,
     // including the visible content rect and the content size.

trunk/Source/WebCore/page/scrolling/ScrollingTree.cpp

@@ -34 +34 @@
 #include "ScrollingTreeNode.h"
 #include "ScrollingTreeState.h"
+#include <wtf/MainThread.h>
 
 namespace WebCore {
@@ -85 +86 @@
 }
 
+void ScrollingTree::updateMainFrameScrollPosition(const IntPoint& scrollPosition)
+{
+    if (!m_scrollingCoordinator)
+        return;
+
+    callOnMainThread(bind(&ScrollingCoordinator::updateMainFrameScrollPosition, m_scrollingCoordinator.get(), scrollPosition));
+}
+
 } // namespace WebCore
 

trunk/Source/WebCore/page/scrolling/ScrollingTree.h

@@ -37 +37 @@
 namespace WebCore {
 
+class IntPoint;
 class PlatformWheelEvent;
 class ScrollingCoordinator;
@@ -62 +63 @@
     void commitNewTreeState(PassOwnPtr<ScrollingTreeState>);
 
+    void updateMainFrameScrollPosition(const IntPoint& scrollPosition);
+
 private:
     explicit ScrollingTree(ScrollingCoordinator*);

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeNodeMac.mm

@@ -30 +30 @@
 
 #include "PlatformWheelEvent.h"
+#include "ScrollingTree.h"
 #include "ScrollingTreeState.h"
 
@@ -73 +74 @@
     setScrollPosition(scrollPosition() + offset);
 
-    // FIXME: Tell the scrolling coordinator that our position changed.
+    scrollingTree()->updateMainFrameScrollPosition(scrollPosition());
 }