<!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>[188641] trunk/Source/WebCore</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/188641">188641</a></dd>
<dt>Author</dt> <dd>wenson_hsieh@apple.com</dd>
<dt>Date</dt> <dd>2015-08-19 11:13:53 -0700 (Wed, 19 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Scroll snapping should trigger when receiving a momentum end wheel event
https://bugs.webkit.org/show_bug.cgi?id=148155
Reviewed by Alexey Proskuryakov.
No new tests, since the purpose of this patch is to get existing tests to pass when
allowing similar wheel events to coalesce. To accomplish this, we relax our assumption
that the user must have generated at least 3 momentum wheel events in order for the
gliding animation to trigger. Upon receiving a wheel event indicating the end of the
momentum phase, we now kick off the gliding animation as long as any momentum event
was tracked earlier in the gesture with a nonzero wheel delta.
* platform/cocoa/ScrollController.mm:
(WebCore::ScrollController::processWheelEventForScrollSnapOnAxis): Added logic to
begin a glide animation if we have received a momentum end event but have not
yet triggered a gliding animation.
* platform/cocoa/ScrollSnapAnimatorState.h:
* platform/cocoa/ScrollSnapAnimatorState.mm:
(WebCore::ScrollSnapAnimatorState::wheelDeltaTrackingIsInProgress): Minor refactoring
to make the wheel event processing code more readable.
(WebCore::ScrollSnapAnimatorState::hasFinishedTrackingWheelDeltas): Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaScrollControllermm">trunk/Source/WebCore/platform/cocoa/ScrollController.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaScrollSnapAnimatorStateh">trunk/Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaScrollSnapAnimatorStatemm">trunk/Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (188640 => 188641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-08-19 16:50:50 UTC (rev 188640)
+++ trunk/Source/WebCore/ChangeLog 2015-08-19 18:13:53 UTC (rev 188641)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-08-18 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Scroll snapping should trigger when receiving a momentum end wheel event
+ https://bugs.webkit.org/show_bug.cgi?id=148155
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests, since the purpose of this patch is to get existing tests to pass when
+ allowing similar wheel events to coalesce. To accomplish this, we relax our assumption
+ that the user must have generated at least 3 momentum wheel events in order for the
+ gliding animation to trigger. Upon receiving a wheel event indicating the end of the
+ momentum phase, we now kick off the gliding animation as long as any momentum event
+ was tracked earlier in the gesture with a nonzero wheel delta.
+
+ * platform/cocoa/ScrollController.mm:
+ (WebCore::ScrollController::processWheelEventForScrollSnapOnAxis): Added logic to
+ begin a glide animation if we have received a momentum end event but have not
+ yet triggered a gliding animation.
+ * platform/cocoa/ScrollSnapAnimatorState.h:
+ * platform/cocoa/ScrollSnapAnimatorState.mm:
+ (WebCore::ScrollSnapAnimatorState::wheelDeltaTrackingIsInProgress): Minor refactoring
+ to make the wheel event processing code more readable.
+ (WebCore::ScrollSnapAnimatorState::hasFinishedTrackingWheelDeltas): Ditto.
+
</ins><span class="cx"> 2015-08-18 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Punctuation near Hindi text is garbled when styled with the system font
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaScrollControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ScrollController.mm (188640 => 188641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2015-08-19 16:50:50 UTC (rev 188640)
+++ trunk/Source/WebCore/platform/cocoa/ScrollController.mm 2015-08-19 18:13:53 UTC (rev 188641)
</span><span class="lines">@@ -554,15 +554,18 @@
</span><span class="cx"> case WheelEventStatus::InertialScrolling:
</span><span class="cx"> // This check for DestinationReached ensures that we don't receive another set of momentum events after ending the last glide.
</span><span class="cx"> if (snapState.m_currentState != ScrollSnapState::Gliding && snapState.m_currentState != ScrollSnapState::DestinationReached) {
</span><del>- if (snapState.m_numWheelDeltasTracked < snapState.wheelDeltaWindowSize && wheelDelta)
</del><ins>+ if (snapState.wheelDeltaTrackingIsInProgress() && wheelDelta)
</ins><span class="cx"> snapState.pushInitialWheelDelta(wheelDelta);
</span><span class="cx">
</span><del>- if ((snapState.m_numWheelDeltasTracked == snapState.wheelDeltaWindowSize) && snapState.averageInitialWheelDelta())
</del><ins>+ if (snapState.hasFinishedTrackingWheelDeltas() && snapState.averageInitialWheelDelta())
</ins><span class="cx"> beginScrollSnapAnimation(axis, ScrollSnapState::Gliding);
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WheelEventStatus::InertialScrollEnd:
</span><ins>+ if (snapState.wheelDeltaTrackingIsInProgress() && snapState.averageInitialWheelDelta())
+ beginScrollSnapAnimation(axis, ScrollSnapState::Gliding);
+
</ins><span class="cx"> snapState.clearInitialWheelDeltaWindow();
</span><span class="cx"> snapState.m_shouldOverrideWheelEvent = false;
</span><span class="cx"> break;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaScrollSnapAnimatorStateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.h (188640 => 188641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.h 2015-08-19 16:50:50 UTC (rev 188640)
+++ trunk/Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.h 2015-08-19 18:13:53 UTC (rev 188641)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> void clearInitialWheelDeltaWindow();
</span><span class="cx"> bool isSnapping() const;
</span><span class="cx"> bool canReachTargetWithCurrentInitialScrollDelta() const;
</span><ins>+ bool wheelDeltaTrackingIsInProgress() const;
+ bool hasFinishedTrackingWheelDeltas() const;
</ins><span class="cx"> float interpolatedOffsetAtProgress(float) const;
</span><span class="cx">
</span><span class="cx"> static const int wheelDeltaWindowSize = 3;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaScrollSnapAnimatorStatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.mm (188640 => 188641)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.mm 2015-08-19 16:50:50 UTC (rev 188640)
+++ trunk/Source/WebCore/platform/cocoa/ScrollSnapAnimatorState.mm 2015-08-19 18:13:53 UTC (rev 188641)
</span><span class="lines">@@ -84,6 +84,16 @@
</span><span class="cx"> return m_initialOffset < m_targetOffset ? m_initialScrollDelta > 0 : m_initialScrollDelta < 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool ScrollSnapAnimatorState::wheelDeltaTrackingIsInProgress() const
+{
+ return m_numWheelDeltasTracked && m_numWheelDeltasTracked < wheelDeltaWindowSize;
+}
+
+bool ScrollSnapAnimatorState::hasFinishedTrackingWheelDeltas() const
+{
+ return m_numWheelDeltasTracked == wheelDeltaWindowSize;
+}
+
</ins><span class="cx"> float ScrollSnapAnimatorState::interpolatedOffsetAtProgress(float progress) const
</span><span class="cx"> {
</span><span class="cx"> progress = std::max(0.0f, std::min(1.0f, progress));
</span></span></pre>
</div>
</div>
</body>
</html>