Changeset 286719 in webkit

Timestamp:

Dec 8, 2021, 1:25:44 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r286411. rdar://problem/85928816

Scrolling complex websites can stutter: scrolling thread frame can fail to process wheel events
​https://bugs.webkit.org/show_bug.cgi?id=233739
rdar://85946176

Reviewed by Tim Horton.

While the scrolling thread is chilling in
ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout(), waiting up to half a
frame to allow the main thread to handle the commit (for scroll synchronization), wheel
events may have been dispatched to the scrolling thread.

If we blow the timeout and commit anyway, we need to make sure we've handled these wheel
events first, so that the current frame can commit some layer movement. We can achieve this
by dispatching the applyLayerPositions(), which will enqueue it behind any waiting wheel
event dispatch from EventDispatcher::internalWheelEvent().

• page/scrolling/ScrollingTree.cpp: (WebCore::ScrollingTree::applyLayerPositions):
• page/scrolling/ThreadedScrollingTree.cpp: (WebCore::ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@286411 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612.4.2.1-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/scrolling/ScrollingTree.cpp (modified) (1 diff)
• page/scrolling/ThreadedScrollingTree.cpp (modified) (1 diff)

branches/safari-612.4.2.1-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-02  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r286411. rdar://problem/85928816
+
+    Scrolling complex websites can stutter: scrolling thread frame can fail to process wheel events
+    https://bugs.webkit.org/show_bug.cgi?id=233739
+    rdar://85946176
+    
+    Reviewed by Tim Horton.
+    
+    While the scrolling thread is chilling in
+    ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout(), waiting up to half a
+    frame to allow the main thread to handle the commit (for scroll synchronization), wheel
+    events may have been dispatched to the scrolling thread.
+    
+    If we blow the timeout and commit anyway, we need to make sure we've handled these wheel
+    events first, so that the current frame can commit some layer movement. We can achieve this
+    by dispatching the applyLayerPositions(), which will enqueue it behind any waiting wheel
+    event dispatch from EventDispatcher::internalWheelEvent().
+    
+    * page/scrolling/ScrollingTree.cpp:
+    (WebCore::ScrollingTree::applyLayerPositions):
+    * page/scrolling/ThreadedScrollingTree.cpp:
+    (WebCore::ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286411 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-12-01  Simon Fraser  <simon.fraser@apple.com>
+
+            Scrolling complex websites can stutter: scrolling thread frame can fail to process wheel events
+            https://bugs.webkit.org/show_bug.cgi?id=233739
+            rdar://85946176
+
+            Reviewed by Tim Horton.
+
+            While the scrolling thread is chilling in
+            ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout(), waiting up to half a
+            frame to allow the main thread to handle the commit (for scroll synchronization), wheel
+            events may have been dispatched to the scrolling thread.
+
+            If we blow the timeout and commit anyway, we need to make sure we've handled these wheel
+            events first, so that the current frame can commit some layer movement. We can achieve this
+            by dispatching the applyLayerPositions(), which will enqueue it behind any waiting wheel
+            event dispatch from EventDispatcher::internalWheelEvent().
+
+            * page/scrolling/ScrollingTree.cpp:
+            (WebCore::ScrollingTree::applyLayerPositions):
+            * page/scrolling/ThreadedScrollingTree.cpp:
+            (WebCore::ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout):
+
 2021-12-01  Alan Coon  <alancoon@apple.com>
 

branches/safari-612.4.2.1-branch/Source/WebCore/page/scrolling/ScrollingTree.cpp

@@ -417 +417 @@
 void ScrollingTree::applyLayerPositions()
 {
-    ASSERT(isMainThread());
     Locker locker { m_treeLock };
 

branches/safari-612.4.2.1-branch/Source/WebCore/page/scrolling/ThreadedScrollingTree.cpp

@@ -338 +338 @@
         // At this point we know the main thread is taking too long in the rendering update,
         // so we give up trying to sync with the main thread and update layers here on the scrolling thread.
-        if (canUpdateLayersOnScrollingThread())
-            applyLayerPositionsInternal();
+        if (canUpdateLayersOnScrollingThread()) {
+            // Dispatch to allow for the scrolling thread to handle any outstanding wheel events before we commit layers.
+            ScrollingThread::dispatch([protectedThis = makeRef(*this)]() {
+                protectedThis->applyLayerPositions();
+            });
+        }
         tracePoint(ScrollingThreadRenderUpdateSyncEnd, 1);
     } else