Changeset 287997 in webkit

Timestamp:

Jan 13, 2022 3:44:28 PM (6 months ago)

Author:

timothy_horton@apple.com

Message:

Sometimes cannot scroll after using internal trackpad
​https://bugs.webkit.org/show_bug.cgi?id=235206
<rdar://problem/87274541>

Reviewed by Simon Fraser.

• WebProcess/WebPage/MomentumEventDispatcher.cpp:

(WebKit::MomentumEventDispatcher::didStartMomentumPhase):
(WebKit::MomentumEventDispatcher::setScrollingAccelerationCurve):

• WebProcess/WebPage/MomentumEventDispatcher.h:

We store std::optional<ScrollingAccelerationCurve> in a map, but then
when looking at whether we have a curve (to decide whether or not to even
use MomentumEventDispatcher), we check if the map has *any* value for the
given page... even an unengaged optional. To fix, check if the optional is engaged.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/MomentumEventDispatcher.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-13  Tim Horton  <timothy_horton@apple.com>
+
+        Sometimes cannot scroll after using internal trackpad
+        https://bugs.webkit.org/show_bug.cgi?id=235206
+        <rdar://problem/87274541>
+
+        Reviewed by Simon Fraser.
+
+        * WebProcess/WebPage/MomentumEventDispatcher.cpp:
+        (WebKit::MomentumEventDispatcher::didStartMomentumPhase):
+        (WebKit::MomentumEventDispatcher::setScrollingAccelerationCurve):
+        * WebProcess/WebPage/MomentumEventDispatcher.h:
+        We store std::optional<ScrollingAccelerationCurve> in a map, but then
+        when looking at whether we have a curve (to decide whether or not to even
+        use MomentumEventDispatcher), we check if the map has *any* value for the
+        given page... even an unengaged optional. To fix, check if the optional is engaged.
+
 2022-01-13  Per Arne Vollan  <pvollan@apple.com>
 

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

@@ -60 +60 @@
         return false;
 
-    if (!m_accelerationCurves.contains(pageIdentifier)) {
+    auto curveIterator = m_accelerationCurves.find(pageIdentifier);
+    if (curveIterator == m_accelerationCurves.end() || !curveIterator->value) {
         RELEASE_LOG(ScrollAnimations, "MomentumEventDispatcher not using synthetic momentum phase: no acceleration curve");
         return false;