Changeset 286720 in webkit

Timestamp:

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

Author:

Alan Coon

Message:

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

Scrolling complex websites can stutter: scrolling thread commit can get blocked on scroll synchronization
​https://bugs.webkit.org/show_bug.cgi?id=233738
rdar://85880147

Reviewed by Tim Horton.

The scroll synchronization added in r261985 can cause dropped frames while scrolling. This
occurs when ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout(), which is
called at the start of a rendering update on the main thread, starts at a time when it will
delay the handling of displayDidRefreshOnScrollingThread(). This can result in delaying the
CA commit for that frame on the scrolling thread.

The solution is to clamp the duration that waitForRenderingUpdateCompletionOrTimeout() waits
on the condition, so that it doesn't exceed the next expected display refresh time.

• page/scrolling/ThreadedScrollingTree.cpp: (WebCore::ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout): (WebCore::ThreadedScrollingTree::displayDidRefreshOnScrollingThread):
• page/scrolling/ThreadedScrollingTree.h:

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

Location:

branches/safari-612.4.2.1-branch/Source/WebCore

Files:

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

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

@@ +1 @@
+2021-12-02  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r286410. rdar://problem/85928816
+
+    Scrolling complex websites can stutter: scrolling thread commit can get blocked on scroll synchronization
+    https://bugs.webkit.org/show_bug.cgi?id=233738
+    rdar://85880147
+    
+    Reviewed by Tim Horton.
+    
+    The scroll synchronization added in r261985 can cause dropped frames while scrolling. This
+    occurs when ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout(), which is
+    called at the start of a rendering update on the main thread, starts at a time when it will
+    delay the handling of displayDidRefreshOnScrollingThread(). This can result in delaying the
+    CA commit for that frame on the scrolling thread.
+    
+    The solution is to clamp the duration that waitForRenderingUpdateCompletionOrTimeout() waits
+    on the condition, so that it doesn't exceed the next expected display refresh time.
+    
+    * page/scrolling/ThreadedScrollingTree.cpp:
+    (WebCore::ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout):
+    (WebCore::ThreadedScrollingTree::displayDidRefreshOnScrollingThread):
+    * page/scrolling/ThreadedScrollingTree.h:
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286410 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-12-01  Simon Fraser  <simon.fraser@apple.com>
+
+            Scrolling complex websites can stutter: scrolling thread commit can get blocked on scroll synchronization
+            https://bugs.webkit.org/show_bug.cgi?id=233738
+            rdar://85880147
+
+            Reviewed by Tim Horton.
+
+            The scroll synchronization added in r261985 can cause dropped frames while scrolling. This
+            occurs when ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout(), which is
+            called at the start of a rendering update on the main thread, starts at a time when it will
+            delay the handling of displayDidRefreshOnScrollingThread(). This can result in delaying the
+            CA commit for that frame on the scrolling thread.
+
+            The solution is to clamp the duration that waitForRenderingUpdateCompletionOrTimeout() waits
+            on the condition, so that it doesn't exceed the next expected display refresh time.
+
+            * page/scrolling/ThreadedScrollingTree.cpp:
+            (WebCore::ThreadedScrollingTree::waitForRenderingUpdateCompletionOrTimeout):
+            (WebCore::ThreadedScrollingTree::displayDidRefreshOnScrollingThread):
+            * page/scrolling/ThreadedScrollingTree.h:
+
 2021-12-02  Russell Epstein  <repstein@apple.com>
 

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

@@ -324 +324 @@
         m_delayedRenderingUpdateDetectionTimer->stop();
 
-    auto startTime = MonotonicTime::now();
-    auto timeoutTime = startTime + maxAllowableRenderingUpdateDurationForSynchronization();
+    auto currentTime = MonotonicTime::now();
+    auto estimatedNextDisplayRefreshTime = std::max(m_lastDisplayDidRefreshTime + frameDuration(), currentTime);
+    auto timeoutTime = std::min(currentTime + maxAllowableRenderingUpdateDurationForSynchronization(), estimatedNextDisplayRefreshTime);
 
     bool becameIdle = m_stateCondition.waitUntil(m_treeLock, timeoutTime, [&] {
@@ -387 +388 @@
 
     Locker locker { m_treeLock };
+    
+    auto now = MonotonicTime::now();
+    m_lastDisplayDidRefreshTime = now;
+    serviceScrollAnimations();
 
     if (m_state != SynchronizationState::Idle && canUpdateLayersOnScrollingThread())

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

@@ -110 +110 @@
     bool m_receivedBeganEventFromMainThread WTF_GUARDED_BY_LOCK(m_treeLock) { false };
     Condition m_waitingForBeganEventCondition;
+    
+    MonotonicTime m_lastDisplayDidRefreshTime;
 
     // Dynamically allocated because it has to use the ScrollingThread's runloop.