KeyboardScrollingAnimator::updateKeyboardScrollPosition is called i…

…ndefinitely when using keyboard smooth scrolling https://bugs.webkit.org/show_bug.cgi?id=245403 rdar://100146415 Reviewed by Tim Horton and Simon Fraser. When the `EventHandler driven smooth scrolling` flag is enabled, `KeyboardScrollingAnimator::updateKeyboardScrollPosition` is called indefinitely, causing the scroll to never terminate. Regression from 8c822fa which accidentally removed the logic of settng `m_scrollTriggeringKeyIsPressed` to `false`. * Source/WebCore/platform/KeyboardScrollingAnimator.cpp: (WebCore::KeyboardScrollingAnimator::handleKeyUpEvent): Canonical link: https://commits.webkit.org/254685@main
WebKit · Sep 20, 2022 · 3ed0f4e · 3ed0f4e
1 parent 274a272
commit 3ed0f4e
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/LayoutTests/fast/scrolling/mac/keyboard-scrolling-terminates-expected.txt b/LayoutTests/fast/scrolling/mac/keyboard-scrolling-terminates-expected.txt
@@ -0,0 +1,4 @@
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
diff --git a/LayoutTests/fast/scrolling/mac/keyboard-scrolling-terminates.html b/LayoutTests/fast/scrolling/mac/keyboard-scrolling-terminates.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html> <!-- webkit-test-runner [ useFlexibleViewport=true EventHandlerDrivenSmoothKeyboardScrollingEnabled=true ] -->
+
+<html>
+
+<head>
+    <script src="../../../resources/ui-helper.js"></script>
+    <script src="../../../resources/js-test.js"></script>
+    <meta name="viewport" content="initial-scale=1.5, user-scalable=no">
+    <script>
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
+        }
+
+        async function runTest()
+        {
+            if (window.eventSender) {
+                eventSender.monitorWheelEvents();
+                eventSender.keyDown("downArrow");
+
+                setTimeout(function() {
+                    eventSender.callAfterScrollingCompletes(() => {
+                        testRunner.notifyDone();
+                    });
+                }, 0);
+            }
+        }
+    </script>
+</head>
+
+<body onload="runTest()">
+    <div style="height: 5000px;">
+    </div>
+</body>
+
+</html>
diff --git a/Source/WebCore/platform/KeyboardScrollingAnimator.cpp b/Source/WebCore/platform/KeyboardScrollingAnimator.cpp
@@ -343,6 +343,7 @@ void KeyboardScrollingAnimator::handleKeyUpEvent()
         return;
 
     stopKeyboardScrollAnimation();
+    m_scrollTriggeringKeyIsPressed = false;
 }
 
 void KeyboardScrollingAnimator::stopScrollingImmediately()