Changeset 166518 in webkit

Timestamp:

Mar 31, 2014 12:42:04 PM (10 years ago)

Author:

Simon Fraser

Message:

Fix scrolling on OS X with UI-side compositing
​https://bugs.webkit.org/show_bug.cgi?id=130930

Reviewed by Tim Horton.

On iOS, we rely on visible rect updates to propagate scroll offset
changes to the WebProcess. RemoteScrollingCoordinatorProxy was thus hardcoded
to bail from scrollPositionChanged() when the scrolled node was the root node,
but this broke OS X. Fix by adding a behavior flag to RemoteScrollingCoordinatorProxy.

• UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:

(WebKit::RemoteScrollingCoordinatorProxy::RemoteScrollingCoordinatorProxy):
(WebKit::RemoteScrollingCoordinatorProxy::scrollPositionChanged):

• UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:

(WebKit::RemoteScrollingCoordinatorProxy::setPropagatesMainFrameScrolls):
(WebKit::RemoteScrollingCoordinatorProxy::propagatesMainFrameScrolls):

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::initializeWebPage):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp (modified) (2 diffs)
• UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h (modified) (2 diffs)
• UIProcess/WebPageProxy.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-03-29  Simon Fraser  <simon.fraser@apple.com>
+
+        Fix scrolling on OS X with UI-side compositing
+        https://bugs.webkit.org/show_bug.cgi?id=130930
+
+        Reviewed by Tim Horton.
+        
+        On iOS, we rely on visible rect updates to propagate scroll offset
+        changes to the WebProcess. RemoteScrollingCoordinatorProxy was thus hardcoded
+        to bail from scrollPositionChanged() when the scrolled node was the root node,
+        but this broke OS X. Fix by adding a behavior flag to RemoteScrollingCoordinatorProxy.
+
+        * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp:
+        (WebKit::RemoteScrollingCoordinatorProxy::RemoteScrollingCoordinatorProxy):
+        (WebKit::RemoteScrollingCoordinatorProxy::scrollPositionChanged):
+        * UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h:
+        (WebKit::RemoteScrollingCoordinatorProxy::setPropagatesMainFrameScrolls):
+        (WebKit::RemoteScrollingCoordinatorProxy::propagatesMainFrameScrolls):
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::initializeWebPage):
+
 2014-03-31  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.cpp

@@ -49 +49 @@
     : m_webPageProxy(webPageProxy)
     , m_scrollingTree(RemoteScrollingTree::create(*this))
+    , m_propagatesMainFrameScrolls(true)
 {
 }
@@ -154 +155 @@
     // Scroll updates for the main frame are sent via WebPageProxy::updateVisibleContentRects()
     // so don't send them here.
-    if (scrolledNodeID == rootScrollingNodeID())
+    if (!m_propagatesMainFrameScrolls && scrolledNodeID == rootScrollingNodeID())
         return;
 

trunk/Source/WebKit2/UIProcess/Scrolling/RemoteScrollingCoordinatorProxy.h

@@ -69 +69 @@
     void updateScrollingTree(const RemoteScrollingCoordinatorTransaction&, bool& fixedOrStickyLayerChanged);
 
+    void setPropagatesMainFrameScrolls(bool propagatesMainFrameScrolls) { m_propagatesMainFrameScrolls = propagatesMainFrameScrolls; }
+    bool propagatesMainFrameScrolls() const { return m_propagatesMainFrameScrolls; }
+
 private:
     void connectStateNodeLayers(WebCore::ScrollingStateTree&, const RemoteLayerTreeHost&, bool& fixedOrStickyLayerChanged);
@@ -74 +77 @@
     WebPageProxy& m_webPageProxy;
     RefPtr<RemoteScrollingTree> m_scrollingTree;
+    bool m_propagatesMainFrameScrolls;
 };
 

trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp

@@ -557 +557 @@
 
 #if ENABLE(ASYNC_SCROLLING)
-    if (m_drawingArea->type() == DrawingAreaTypeRemoteLayerTree)
+    if (m_drawingArea->type() == DrawingAreaTypeRemoteLayerTree) {
         m_scrollingCoordinatorProxy = std::make_unique<RemoteScrollingCoordinatorProxy>(*this);
+#if PLATFORM(IOS)
+        // On iOS, main frame scrolls are sent in terms of visible rect updates.
+        m_scrollingCoordinatorProxy->setPropagatesMainFrameScrolls(false);
+#endif
+    }
 #endif