Changeset 285992 in webkit

Timestamp:

Nov 18, 2021, 2:06:53 AM (5 years ago)

Author:

Chris Lord

Message:

[GLIB] twitch.tv forces synchronous scrolling
​https://bugs.webkit.org/show_bug.cgi?id=232376
<rdar://problem/85247010>

Reviewed by Simon Fraser.

Source/WebCore:

Make sure to keep the userScrollInProgress flag in sync for scrolling
nodes in the nicosia backend and add a utility function to determine
if user scroll is in progress for a given wheel event. This lets
EventDispatcher dispatch events asynchronously in that case.

No new tests, exercised by existing tests.

• page/scrolling/ScrollingTree.cpp:

(WebCore::ScrollingTree::isUserScrollInProgressAtEventLocation):

• page/scrolling/ScrollingTree.h:
• page/scrolling/ScrollingTreeScrollingNode.cpp:

(WebCore::ScrollingTreeScrollingNode::isUserScrollInProgress const):
(WebCore::ScrollingTreeScrollingNode::isUserScrollProgress const): Deleted.

• page/scrolling/ScrollingTreeScrollingNode.h:
• page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp:

(WebCore::ScrollingTreeScrollingNodeDelegateNicosia::handleWheelEvent):

Source/WebKit:

Don't force synchronous wheel event delivery for scroll events when
a user scroll is in progress.

• WebProcess/WebPage/EventDispatcher.cpp:

(WebKit::EventDispatcher::wheelEvent):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTree.cpp (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTree.h (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTreeScrollingNode.cpp (modified) (1 diff)
• WebCore/page/scrolling/ScrollingTreeScrollingNode.h (modified) (1 diff)
• WebCore/page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp (modified) (1 diff)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/WebProcess/WebPage/EventDispatcher.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-18  Chris Lord  <clord@igalia.com>
+
+        [GLIB] twitch.tv forces synchronous scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=232376
+        <rdar://problem/85247010>
+
+        Reviewed by Simon Fraser.
+
+        Make sure to keep the userScrollInProgress flag in sync for scrolling
+        nodes in the nicosia backend and add a utility function to determine
+        if user scroll is in progress for a given wheel event. This lets
+        EventDispatcher dispatch events asynchronously in that case.
+
+        No new tests, exercised by existing tests.
+
+        * page/scrolling/ScrollingTree.cpp:
+        (WebCore::ScrollingTree::isUserScrollInProgressAtEventLocation):
+        * page/scrolling/ScrollingTree.h:
+        * page/scrolling/ScrollingTreeScrollingNode.cpp:
+        (WebCore::ScrollingTreeScrollingNode::isUserScrollInProgress const):
+        (WebCore::ScrollingTreeScrollingNode::isUserScrollProgress const): Deleted.
+        * page/scrolling/ScrollingTreeScrollingNode.h:
+        * page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp:
+        (WebCore::ScrollingTreeScrollingNodeDelegateNicosia::handleWheelEvent):
+
 2021-11-18  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -64 +64 @@
 ScrollingTree::~ScrollingTree() = default;
 
+bool ScrollingTree::isUserScrollInProgressAtEventLocation(const PlatformWheelEvent& wheelEvent)
+{
+    if (!m_rootNode)
+        return false;
+
+    // This method is invoked by the event handling thread
+    Locker locker { m_treeStateLock };
+
+    if (m_treeState.nodesWithActiveUserScrolls.isEmpty())
+        return false;
+
+    FloatPoint position = wheelEvent.position();
+    position.move(m_rootNode->viewToContentsOffset(m_treeState.mainFrameScrollPosition));
+    if (auto node = scrollingNodeForPoint(position))
+        return m_treeState.nodesWithActiveUserScrolls.contains(node->scrollingNodeID());
+
+    return false;
+}
+
 OptionSet<WheelEventProcessingSteps> ScrollingTree::computeWheelProcessingSteps(const PlatformWheelEvent& wheelEvent)
 {

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

@@ -104 +104 @@
     void setMomentumScrollingAnimatorEnabled(bool value) { m_momentumScrollingAnimatorEnabled = value; }
 
+    WEBCORE_EXPORT bool isUserScrollInProgressAtEventLocation(const PlatformWheelEvent&);
     WEBCORE_EXPORT OptionSet<WheelEventProcessingSteps> determineWheelEventProcessing(const PlatformWheelEvent&);
     WEBCORE_EXPORT virtual WheelEventHandlingResult handleWheelEvent(const PlatformWheelEvent&, OptionSet<WheelEventProcessingSteps> = { });

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

@@ -206 +206 @@
 }
 
-bool ScrollingTreeScrollingNode::isUserScrollProgress() const
+bool ScrollingTreeScrollingNode::isUserScrollInProgress() const
 {
     return scrollingTree().isUserScrollInProgressForNode(scrollingNodeID());

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

@@ -70 +70 @@
     RectEdges<bool> edgePinnedState() const;
 
-    bool isUserScrollProgress() const;
+    bool isUserScrollInProgress() const;
     void setUserScrollInProgress(bool);
 

trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeScrollingNodeDelegateNicosia.cpp

@@ -81 +81 @@
 WheelEventHandlingResult ScrollingTreeScrollingNodeDelegateNicosia::handleWheelEvent(const PlatformWheelEvent& wheelEvent, EventTargeting eventTargeting)
 {
-    if (!scrollingNode().canHandleWheelEvent(wheelEvent, eventTargeting)
-        || !m_scrollController.handleWheelEvent(wheelEvent))
-        return WheelEventHandlingResult::unhandled();
+    bool wasInUserScroll = m_scrollController.isUserScrollInProgress();
+    bool handled = scrollingNode().canHandleWheelEvent(wheelEvent, eventTargeting) && m_scrollController.handleWheelEvent(wheelEvent);
+    bool isInUserScroll = m_scrollController.isUserScrollInProgress();
 
-    return WheelEventHandlingResult::handled();
+    if (isInUserScroll != wasInUserScroll)
+        scrollingNode().setUserScrollInProgress(isInUserScroll);
+
+    return handled ? WheelEventHandlingResult::handled() : WheelEventHandlingResult::unhandled();
 }
 

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-11-18  Chris Lord  <clord@igalia.com>
+
+        [GLIB] twitch.tv forces synchronous scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=232376
+        <rdar://problem/85247010>
+
+        Reviewed by Simon Fraser.
+
+        Don't force synchronous wheel event delivery for scroll events when
+        a user scroll is in progress.
+
+        * WebProcess/WebPage/EventDispatcher.cpp:
+        (WebKit::EventDispatcher::wheelEvent):
+
 2021-11-18  Kimmo Kinnunen  <kkinnunen@apple.com>
 

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

@@ -49 +49 @@
 #if ENABLE(SCROLLING_THREAD)
 #include <WebCore/ScrollingThread.h>
+#include <WebCore/ScrollingTreeNode.h>
 #include <WebCore/ThreadedScrollingTree.h>
 #endif
@@ -126 +127 @@
 
         auto processingSteps = scrollingTree->determineWheelEventProcessing(platformWheelEvent);
+        bool useMainThreadForScrolling = processingSteps.contains(WheelEventProcessingSteps::MainThreadForScrolling);
+
+#if !PLATFORM(COCOA)
+        // Deliver continuing scroll gestures directly to the scrolling thread.
+        if (platformWheelEvent.phase() == PlatformWheelEventPhase::Changed && scrollingTree->isUserScrollInProgressAtEventLocation(platformWheelEvent))
+            useMainThreadForScrolling = false;
+#endif
 
         scrollingTree->willProcessWheelEvent();
 
-        ScrollingThread::dispatch([scrollingTree, wheelEvent, platformWheelEvent, processingSteps, pageID, protectedThis = Ref { *this }] {
-            if (processingSteps.contains(WheelEventProcessingSteps::MainThreadForScrolling)) {
+        ScrollingThread::dispatch([scrollingTree, wheelEvent, platformWheelEvent, processingSteps, useMainThreadForScrolling, pageID, protectedThis = Ref { *this }] {
+            if (useMainThreadForScrolling) {
                 scrollingTree->willSendEventToMainThread(platformWheelEvent);
                 protectedThis->dispatchWheelEventViaMainThread(pageID, wheelEvent, processingSteps);
@@ -136 +144 @@
                 return;
             }
-        
+
             auto result = scrollingTree->handleWheelEvent(platformWheelEvent, processingSteps);