Changeset 285797 in webkit

Timestamp:

Nov 14, 2021, 8:06:38 PM (5 years ago)

Author:

Simon Fraser

Message:

Fingers down on the trackpad should stop an animated scroll
​https://bugs.webkit.org/show_bug.cgi?id=233114

Reviewed by Wenson Hsieh.
Source/WebCore:

Fingers down on the trackpad sends a "MayBegin" event; this needs to stop any in-progress
animated momentum scroll.

This failed because ScrollingTreeScrollingNodeDelegateMac::handleWheelEvent() early-returned
on the MayBegin event before it got to ScrollingEffectsController. Fix that, and have
ScrollingEffectsController::handleWheelEvent() return true to say it was handled.

This triggered an assertion in ScrollingTreeGestureState, but for "post-main-thread"
handling for which the assertion was wrong.

Test: fast/scrolling/mac/momentum-animator-maybegin-stops.html

• page/scrolling/ScrollingTreeGestureState.cpp:

(WebCore::ScrollingTreeGestureState::nodeDidHandleEvent):

• page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm:

(WebCore::ScrollingTreeScrollingNodeDelegateMac::handleWheelEvent):

• platform/mac/ScrollingEffectsController.mm:

(WebCore::ScrollingEffectsController::handleWheelEvent):

LayoutTests:

• fast/scrolling/mac/momentum-animator-maybegin-stops-expected.txt: Added.
• fast/scrolling/mac/momentum-animator-maybegin-stops.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/scrolling/mac/momentum-animator-maybegin-stops-expected.txt (added)
• LayoutTests/fast/scrolling/mac/momentum-animator-maybegin-stops.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/scrolling/ScrollingTreeGestureState.cpp (modified) (1 diff)
• Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm (modified) (1 diff)
• Source/WebCore/platform/mac/ScrollingEffectsController.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Fingers down on the trackpad should stop an animated scroll
+        https://bugs.webkit.org/show_bug.cgi?id=233114
+
+        Reviewed by Wenson Hsieh.
+
+        * fast/scrolling/mac/momentum-animator-maybegin-stops-expected.txt: Added.
+        * fast/scrolling/mac/momentum-animator-maybegin-stops.html: Added.
+
 2021-11-13  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-14  Simon Fraser  <simon.fraser@apple.com>
+
+        Fingers down on the trackpad should stop an animated scroll
+        https://bugs.webkit.org/show_bug.cgi?id=233114
+
+        Reviewed by Wenson Hsieh.
+        
+        Fingers down on the trackpad sends a "MayBegin" event; this needs to stop any in-progress
+        animated momentum scroll.
+
+        This failed because ScrollingTreeScrollingNodeDelegateMac::handleWheelEvent() early-returned
+        on the MayBegin event before it got to ScrollingEffectsController. Fix that, and have
+        ScrollingEffectsController::handleWheelEvent() return true to say it was handled.
+
+        This triggered an assertion in ScrollingTreeGestureState, but for "post-main-thread"
+        handling for which the assertion was wrong.
+
+        Test: fast/scrolling/mac/momentum-animator-maybegin-stops.html
+
+        * page/scrolling/ScrollingTreeGestureState.cpp:
+        (WebCore::ScrollingTreeGestureState::nodeDidHandleEvent):
+        * page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm:
+        (WebCore::ScrollingTreeScrollingNodeDelegateMac::handleWheelEvent):
+        * platform/mac/ScrollingEffectsController.mm:
+        (WebCore::ScrollingEffectsController::handleWheelEvent):
+
 2021-11-14  Said Abou-Hallawa  <said@apple.com>
 

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

@@ -67 +67 @@
         break;
     case PlatformWheelEventPhase::Cancelled:
-        // handleGestureCancel() should have been called first.
-        ASSERT_NOT_REACHED();
+        // We can get here for via handleWheelEventAfterMainThread(), in which case handleGestureCancel() was not called first.
+        handleGestureCancel(event);
         break;
     case PlatformWheelEventPhase::Began:

trunk/Source/WebCore/page/scrolling/mac/ScrollingTreeScrollingNodeDelegateMac.mm

@@ -107 +107 @@
         scrollingNode().setUserScrollInProgress(isInUserScroll);
 
-    // PlatformWheelEventPhase::MayBegin fires when two fingers touch the trackpad, and is used to flash overlay scrollbars.
-    // We know we're scrollable at this point, so handle the event.
-    if (wheelEvent.phase() == PlatformWheelEventPhase::MayBegin)
-        return true;
-
     return m_scrollController.handleWheelEvent(wheelEvent);
 }

trunk/Source/WebCore/platform/mac/ScrollingEffectsController.mm

@@ -141 +141 @@
             stopAnimatedScroll();
         }
-        return false;
+        return true;
     }