<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[286699] branches/safari-612-branch/Source/WebKit</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/286699">286699</a></dd>
<dt>Author</dt> <dd>alancoon@apple.com</dd>
<dt>Date</dt> <dd>2021-12-08 12:23:57 -0800 (Wed, 08 Dec 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/286566">r286566</a>. 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</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari612branchSourceWebKitChangeLog">branches/safari-612-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari612branchSourceWebKitWebProcessWebPageMomentumEventDispatchercpp">branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari612branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/ChangeLog (286698 => 286699)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/ChangeLog       2021-12-08 20:23:54 UTC (rev 286698)
+++ branches/safari-612-branch/Source/WebKit/ChangeLog  2021-12-08 20:23:57 UTC (rev 286699)
</span><span class="lines">@@ -1,5 +1,42 @@
</span><span class="cx"> 2021-12-06  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><ins>+        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>
+
</ins><span class="cx">         Cherry-pick r286537. rdar://problem/85928816
</span><span class="cx"> 
</span><span class="cx">     Add trace points for generated momentum events
</span></span></pre></div>
<a id="branchessafari612branchSourceWebKitWebProcessWebPageMomentumEventDispatchercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp (286698 => 286699)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp  2021-12-08 20:23:54 UTC (rev 286698)
+++ branches/safari-612-branch/Source/WebKit/WebProcess/WebPage/MomentumEventDispatcher.cpp     2021-12-08 20:23:57 UTC (rev 286699)
</span><span class="lines">@@ -306,7 +306,10 @@
</span><span class="cx"> 
</span><span class="cx">     m_currentGesture.currentOffset += delta;
</span><span class="cx"> 
</span><del>-    return -delta;
</del><ins>+    if (m_currentGesture.initiatingEvent->directionInvertedFromDevice())
+        delta.scale(-1);
+
+    return delta;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MomentumEventDispatcher::displayWasRefreshed(WebCore::PlatformDisplayID displayID, const WebCore::DisplayUpdate&)
</span><span class="lines">@@ -478,10 +481,8 @@
</span><span class="cx">         float averageDelta = totalDelta / count;
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(MOMENTUM_EVENT_DISPATCHER_TEMPORARY_LOGGING)
</span><del>-        if (!m_currentGesture.didLogInitialQueueState) {
</del><ins>+        if (!m_currentGesture.didLogInitialQueueState)
</ins><span class="cx">             RELEASE_LOG(ScrollAnimations, "MomentumEventDispatcher initial historical deltas: average delta %f, average time %fms, event count %d", averageDelta, averageFrameIntervalMS, count);
</span><del>-            m_currentGesture.didLogInitialQueueState = true;
-        }
</del><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">         constexpr float velocityGainA = fromFixedPoint(2.f);
</span><span class="lines">@@ -502,6 +503,10 @@
</span><span class="cx">         accelerateAxis(m_deltaHistoryY, quantizedUnacceleratedDelta.height())
</span><span class="cx">     );
</span><span class="cx"> 
</span><ins>+#if ENABLE(MOMENTUM_EVENT_DISPATCHER_TEMPORARY_LOGGING)
+    m_currentGesture.didLogInitialQueueState = true;
+#endif
+
</ins><span class="cx">     return { unacceleratedDelta, acceleratedDelta };
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>