Changeset 275892 in webkit

Timestamp:

Apr 13, 2021, 9:55:33 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, reverting r275889.
​https://bugs.webkit.org/show_bug.cgi?id=224488

Unintentional commit

Reverted changeset:

​https://trac.webkit.org/changeset/275889

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTree.cpp (modified) (1 diff)
• WebCore/page/scrolling/ThreadedScrollingTree.cpp (modified) (4 diffs)
• WebCore/page/scrolling/ThreadedScrollingTree.h (modified) (3 diffs)
• WebCore/platform/graphics/AnimationFrameRate.h (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/EventDispatcher.cpp (modified) (2 diffs)
• WebKit/WebProcess/WebPage/EventDispatcher.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-04-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r275889.
+        https://bugs.webkit.org/show_bug.cgi?id=224488
+
+        Unintentional commit
+
+        Reverted changeset:
+
+        https://trac.webkit.org/changeset/275889
+
 2021-04-13  Sihui Liu  <sihui_liu@apple.com>
 

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

@@ -423 +423 @@
         return;
 
-    LOG_WITH_STREAM(Scrolling, stream << "ScrollingTree::applyLayerPositionsInternal - main thread " << isMainThread());
-
     applyLayerPositionsRecursive(*m_rootNode);
 }

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

@@ -211 +211 @@
     }
 
+    LOG_WITH_STREAM(Scrolling, stream << "ThreadedScrollingTree::scrollingTreeNodeDidScroll " << node.scrollingNodeID() << " to " << scrollPosition << " triggering main thread rendering update");
+
     auto scrollUpdate = ScrollUpdate { node.scrollingNodeID(), scrollPosition, layoutViewportOrigin, scrollingLayerPositionAction };
     addPendingScrollUpdate(WTFMove(scrollUpdate));
 
-    if (m_hasScheduledNextRenderingUpdate) {
-        LOG_WITH_STREAM(Scrolling, stream << "ThreadedScrollingTree::scrollingTreeNodeDidScroll " << node.scrollingNodeID() << " to " << scrollPosition << " - rendering update already scheduled");
-        return;
-    }
-
-    LOG_WITH_STREAM(Scrolling, stream << "ThreadedScrollingTree::scrollingTreeNodeDidScroll " << node.scrollingNodeID() << " to " << scrollPosition << " bouncing to main thread");
-
-    m_hasScheduledNextRenderingUpdate = true;
     auto deferrer = WheelEventTestMonitorCompletionDeferrer { wheelEventTestMonitor(), reinterpret_cast<WheelEventTestMonitor::ScrollableAreaIdentifier>(node.scrollingNodeID()), WheelEventTestMonitor::ScrollingThreadSyncNeeded };
     RunLoop::main().dispatch([strongThis = makeRef(*this), deferrer = WTFMove(deferrer)] {
@@ -281 +275 @@
     ASSERT(isMainThread());
 
-    {
-        LockHolder treeLocker(m_treeMutex);
-        m_hasScheduledNextRenderingUpdate = false;
-    }
-
-    if (!hasProcessedWheelEventsRecently()) {
-        LOG_WITH_STREAM(Scrolling, stream << "ThreadedScrollingTree::willStartRenderingUpdate - no recent events");
-        return;
-    }
+    if (!hasProcessedWheelEventsRecently())
+        return;
 
     tracePoint(ScrollingThreadRenderUpdateSyncStart);
@@ -385 +372 @@
     LockHolder treeLocker(m_treeMutex);
 
-    LOG_WITH_STREAM(Scrolling, stream << "ThreadedScrollingTree::displayDidRefreshOnScrollingThread - hasScheduledNextRenderingUpdate " << m_hasScheduledNextRenderingUpdate);
-
     if (m_state != SynchronizationState::Idle && canUpdateLayersOnScrollingThread())
         applyLayerPositionsInternal();
@@ -404 +389 @@
 }
 
-void ThreadedScrollingTree::displayDidRefresh(PlatformDisplayID displayID, ShouldSyncWithMainThread)
+void ThreadedScrollingTree::displayDidRefresh(PlatformDisplayID displayID)
 {
     // We're on the EventDispatcher thread or in the ThreadedCompositor thread here.

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

@@ -38 +38 @@
 class AsyncScrollingCoordinator;
 
-enum class ShouldSyncWithMainThread : bool {
-    No,
-    Yes
-};
-
 // The ThreadedScrollingTree class lives almost exclusively on the scrolling thread and manages the
 // hierarchy of scrollable regions on the page. It's also responsible for dispatching events
@@ -61 +56 @@
     void invalidate() override;
 
-    WEBCORE_EXPORT void displayDidRefresh(PlatformDisplayID, ShouldSyncWithMainThread);
+    WEBCORE_EXPORT void displayDidRefresh(PlatformDisplayID);
 
     void willStartRenderingUpdate();
@@ -120 +115 @@
     bool m_scrollAnimatorEnabled { false };
     bool m_hasNodesWithSynchronousScrollingReasons { false };
-    bool m_hasScheduledNextRenderingUpdate { false };
 };
 

trunk/Source/WebCore/platform/graphics/AnimationFrameRate.h

@@ -46 +46 @@
 
 // Allow a little more than 60fps to make sure we can at least hit that frame rate.
-constexpr const Seconds FullSpeedAnimationInterval { 31_ms };
+constexpr const Seconds FullSpeedAnimationInterval { 15_ms };
 // Allow a little more than 30fps to make sure we can at least hit that frame rate.
-constexpr const Seconds HalfSpeedThrottlingAnimationInterval { 60_ms };
+constexpr const Seconds HalfSpeedThrottlingAnimationInterval { 30_ms };
 constexpr const Seconds AggressiveThrottlingAnimationInterval { 10_s };
 constexpr const int IntervalThrottlingFactor { 2 };
 
-constexpr const FramesPerSecond FullSpeedFramesPerSecond = 30;
-constexpr const FramesPerSecond HalfSpeedThrottlingFramesPerSecond = 15;
+constexpr const FramesPerSecond FullSpeedFramesPerSecond = 60;
+constexpr const FramesPerSecond HalfSpeedThrottlingFramesPerSecond = 30;
 
 WEBCORE_EXPORT FramesPerSecond framesPerSecondNearestFullSpeed(FramesPerSecond);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-04-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, reverting r275889.
+        https://bugs.webkit.org/show_bug.cgi?id=224488
+
+        Unintentional commit
+
+        Reverted changeset:
+
+        https://trac.webkit.org/changeset/275889
+
 2021-04-13  Sihui Liu  <sihui_liu@apple.com>
 

trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.cpp

@@ -280 +280 @@
 #endif
 
-void EventDispatcher::notifyScrollingTreesDisplayWasRefreshed(PlatformDisplayID displayID, bool shouldSyncWithMainThread)
+void EventDispatcher::notifyScrollingTreesDisplayWasRefreshed(PlatformDisplayID displayID)
 {
 #if ENABLE(SCROLLING_THREAD)
     LockHolder locker(m_scrollingTreesMutex);
     for (auto keyValuePair : m_scrollingTrees)
-        keyValuePair.value->displayDidRefresh(displayID, shouldSyncWithMainThread ? ShouldSyncWithMainThread::Yes : ShouldSyncWithMainThread::No);
+        keyValuePair.value->displayDidRefresh(displayID);
 #endif
 }
@@ -293 +293 @@
 {
     ASSERT(!RunLoop::isMain());
-    notifyScrollingTreesDisplayWasRefreshed(displayID, sendToMainThread);
-
-    // FIXME: We need ensure that the last update in a sequence always has "send to main thread".
+    notifyScrollingTreesDisplayWasRefreshed(displayID);
+
     if (!sendToMainThread)
         return;

trunk/Source/WebKit/WebProcess/WebPage/EventDispatcher.h

@@ -75 +75 @@
     void initializeConnection(IPC::Connection*);
 
-    void notifyScrollingTreesDisplayWasRefreshed(WebCore::PlatformDisplayID, bool shouldSyncWithMainThread = true);
+    void notifyScrollingTreesDisplayWasRefreshed(WebCore::PlatformDisplayID);
 
 private: