Changeset 286732 in webkit

Timestamp:

Dec 8, 2021, 1:26:26 PM (5 years ago)

Author:

Alan Coon

Message:

Cherry-pick r286566. rdar://problem/85928816

Momentum Event Dispatcher: Momentum phase runs backwards with natural scrolling disabled
​https://bugs.webkit.org/show_bug.cgi?id=233894
<rdar://problem/86111948>

Reviewed by Simon Fraser.

• WebProcess/WebPage/MomentumEventDispatcher.cpp: (WebKit::MomentumEventDispatcher::consumeDeltaForCurrentTime): Only flip the deltas if the trackpad is configured to use "natural" scrolling (in which "directionInvertedFromDevice" is true).

(WebKit::MomentumEventDispatcher::computeNextDelta):
Fix initial queue state logging to log both axes before setting the "did log" bit.

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@286566 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-612.4.2.1-branch/Source/WebKit

Files:

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

branches/safari-612.4.2.1-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2021-12-06  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r286566. rdar://problem/85928816
+
+    Momentum Event Dispatcher: Momentum phase runs backwards with natural scrolling disabled
+    https://bugs.webkit.org/show_bug.cgi?id=233894
+    <rdar://problem/86111948>
+    
+    Reviewed by Simon Fraser.
+    
+    * WebProcess/WebPage/MomentumEventDispatcher.cpp:
+    (WebKit::MomentumEventDispatcher::consumeDeltaForCurrentTime):
+    Only flip the deltas if the trackpad is configured to use "natural"
+    scrolling (in which "directionInvertedFromDevice" is true).
+    
+    (WebKit::MomentumEventDispatcher::computeNextDelta):
+    Fix initial queue state logging to log both axes before setting the "did log" bit.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@286566 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-12-06  Tim Horton  <timothy_horton@apple.com>
+
+            Momentum Event Dispatcher: Momentum phase runs backwards with natural scrolling disabled
+            https://bugs.webkit.org/show_bug.cgi?id=233894
+            <rdar://problem/86111948>
+
+            Reviewed by Simon Fraser.
+
+            * WebProcess/WebPage/MomentumEventDispatcher.cpp:
+            (WebKit::MomentumEventDispatcher::consumeDeltaForCurrentTime):
+            Only flip the deltas if the trackpad is configured to use "natural"
+            scrolling (in which "directionInvertedFromDevice" is true).
+
+            (WebKit::MomentumEventDispatcher::computeNextDelta):
+            Fix initial queue state logging to log both axes before setting the "did log" bit.
+
 2021-12-06  Alan Coon  <alancoon@apple.com>
 

branches/safari-612.4.2.1-branch/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp

@@ -307 +307 @@
     m_currentGesture.currentOffset += delta;
 
-    return -delta;
+    if (m_currentGesture.initiatingEvent->directionInvertedFromDevice())
+        delta.scale(-1);
+
+    return delta;
 }
 
@@ -479 +482 @@
 
 #if ENABLE(MOMENTUM_EVENT_DISPATCHER_TEMPORARY_LOGGING)
-        if (!m_currentGesture.didLogInitialQueueState) {
+        if (!m_currentGesture.didLogInitialQueueState)
             RELEASE_LOG(ScrollAnimations, "MomentumEventDispatcher initial historical deltas: average delta %f, average time %fms, event count %d", averageDelta, averageFrameIntervalMS, count);
-            m_currentGesture.didLogInitialQueueState = true;
-        }
 #endif
 
@@ -503 +504 @@
     );
 
+#if ENABLE(MOMENTUM_EVENT_DISPATCHER_TEMPORARY_LOGGING)
+    m_currentGesture.didLogInitialQueueState = true;
+#endif
+
     return { unacceleratedDelta, acceleratedDelta };
 }