Changeset 238690 in webkit

Timestamp:

Nov 29, 2018 1:22:02 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Make reconcileViewportConstrainedLayerPositions start from a specified scrolling node
​https://bugs.webkit.org/show_bug.cgi?id=180002

Patch by Frederic Wang <​fwang@igalia.com> on 2018-11-29
Reviewed by Simon Fraser.

For non-programmatic scrolling of frames, AsyncScrollingCoordinator::reconcileScrollingState
currently always call reconcileViewportConstrainedLayerPositions for the main frame
since async subframe scrolling is not supported yet (bug 171667 and bug 149264). This
function in turn calls reconcileLayerPositionForViewportRect on the whole scrolling tree to
readjust position of fixed/sticky descendants. This patch refactors a bit the code so that
the operation is actually only applied to the descendants of the frame's scrolling node,
which would mean a small optimization when subframe are asynchronously scrollable. The code
is already covered by reconcile-layer-position-recursive.html.

No new tests, behavior unchanged and already covered by existing tests.

• page/scrolling/AsyncScrollingCoordinator.cpp:

(WebCore::AsyncScrollingCoordinator::reconcileScrollingState): Pass the frame's scrolling
node id.
(WebCore::AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions): Start
reconciliation from the specified scrolling node and log its ID.

• page/scrolling/AsyncScrollingCoordinator.h: Add ScrollingNodeID parameter.
• page/scrolling/ScrollingCoordinator.h:

(WebCore::ScrollingCoordinator::reconcileViewportConstrainedLayerPositions): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/AsyncScrollingCoordinator.cpp (modified) (2 diffs)
• page/scrolling/AsyncScrollingCoordinator.h (modified) (1 diff)
• page/scrolling/ScrollingCoordinator.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-11-29  Frederic Wang  <fwang@igalia.com>
+
+        Make reconcileViewportConstrainedLayerPositions start from a specified scrolling node
+        https://bugs.webkit.org/show_bug.cgi?id=180002
+
+        Reviewed by Simon Fraser.
+
+        For non-programmatic scrolling of frames, AsyncScrollingCoordinator::reconcileScrollingState
+        currently always call reconcileViewportConstrainedLayerPositions for the main frame
+        since async subframe scrolling is not supported yet (bug 171667 and bug 149264). This
+        function in turn calls reconcileLayerPositionForViewportRect on the whole scrolling tree to
+        readjust position of fixed/sticky descendants. This patch refactors a bit the code so that
+        the operation is actually only applied to the descendants of the frame's scrolling node,
+        which would mean a small optimization when subframe are asynchronously scrollable. The code
+        is already covered by reconcile-layer-position-recursive.html.
+
+        No new tests, behavior unchanged and already covered by existing tests.
+
+        * page/scrolling/AsyncScrollingCoordinator.cpp:
+        (WebCore::AsyncScrollingCoordinator::reconcileScrollingState): Pass the frame's scrolling
+        node id.
+        (WebCore::AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions): Start
+        reconciliation from the specified scrolling node and log its ID.
+        * page/scrolling/AsyncScrollingCoordinator.h: Add ScrollingNodeID parameter.
+        * page/scrolling/ScrollingCoordinator.h:
+        (WebCore::ScrollingCoordinator::reconcileViewportConstrainedLayerPositions): Ditto.
+
 2018-11-29  Zalan Bujtas  <zalan@apple.com>
 

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

@@ -399 +399 @@
 
     if (!programmaticScroll && scrollingLayerPositionAction != ScrollingLayerPositionAction::Set) {
+        auto scrollingNodeID = frameView.scrollLayerID();
         if (viewportRectStability == ViewportRectStability::Stable)
-            reconcileViewportConstrainedLayerPositions(frameView.rectForFixedPositionLayout(), scrollingLayerPositionAction);
+            reconcileViewportConstrainedLayerPositions(scrollingNodeID, frameView.rectForFixedPositionLayout(), scrollingLayerPositionAction);
         else if (layoutViewportRect)
-            reconcileViewportConstrainedLayerPositions(LayoutRect(layoutViewportRect.value()), scrollingLayerPositionAction);
+            reconcileViewportConstrainedLayerPositions(scrollingNodeID, LayoutRect(layoutViewportRect.value()), scrollingLayerPositionAction);
     }
 
@@ -489 +490 @@
 }
 
-void AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions(const LayoutRect& viewportRect, ScrollingLayerPositionAction action)
-{
-    if (!m_scrollingStateTree->rootStateNode())
-        return;
-
-    LOG_WITH_STREAM(Scrolling, stream << getCurrentProcessID() << " AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions for viewport rect " << viewportRect);
-
-    m_scrollingStateTree->rootStateNode()->reconcileLayerPositionForViewportRect(viewportRect, action);
+void AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions(ScrollingNodeID scrollingNodeID, const LayoutRect& viewportRect, ScrollingLayerPositionAction action)
+{
+    auto* scrollingNode = m_scrollingStateTree->stateNodeForID(scrollingNodeID);
+    if (!scrollingNode)
+        return;
+
+    LOG_WITH_STREAM(Scrolling, stream << getCurrentProcessID() << " AsyncScrollingCoordinator::reconcileViewportConstrainedLayerPositions for viewport rect " << viewportRect << " and node " << scrollingNodeID);
+
+    scrollingNode->reconcileLayerPositionForViewportRect(viewportRect, action);
 }
 

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

@@ -117 +117 @@
 #endif
 
-    WEBCORE_EXPORT void reconcileViewportConstrainedLayerPositions(const LayoutRect& viewportRect, ScrollingLayerPositionAction) override;
+    WEBCORE_EXPORT void reconcileViewportConstrainedLayerPositions(ScrollingNodeID, const LayoutRect& viewportRect, ScrollingLayerPositionAction) override;
     WEBCORE_EXPORT void scrollableAreaScrollbarLayerDidChange(ScrollableArea&, ScrollbarOrientation) override;
 

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

@@ -192 +192 @@
     virtual void updateFrameScrollingNode(ScrollingNodeID, GraphicsLayer* /*scrollLayer*/, GraphicsLayer* /*scrolledContentsLayer*/, GraphicsLayer* /*counterScrollingLayer*/, GraphicsLayer* /*insetClipLayer*/, const ScrollingGeometry* = nullptr) { }
     virtual void updateOverflowScrollingNode(ScrollingNodeID, GraphicsLayer* /*scrollLayer*/, GraphicsLayer* /*scrolledContentsLayer*/, const ScrollingGeometry* = nullptr) { }
-    virtual void reconcileViewportConstrainedLayerPositions(const LayoutRect&, ScrollingLayerPositionAction) { }
+    virtual void reconcileViewportConstrainedLayerPositions(ScrollingNodeID, const LayoutRect&, ScrollingLayerPositionAction) { }
     virtual String scrollingStateTreeAsText(ScrollingStateTreeAsTextBehavior = ScrollingStateTreeAsTextBehaviorNormal) const;
     virtual bool isRubberBandInProgress() const { return false; }