<!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>[172659] 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/172659">172659</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-15 16:35:21 -0700 (Fri, 15 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix gliding in AxisScrollSnapAnimator for Mac
https://bugs.webkit.org/show_bug.cgi?id=135971
Patch by Wenson Hsieh <wenson_hsieh@apple.com> on 2014-08-15
Reviewed by Dean Jackson.
Previously, momentum events that are handled immediately after finishing a glide animation cause a second, extremely
slow glide animation to trigger. To fix this, I added a new state DestinationReached. During this state, additional
momentum events that are handled after the glide animation completes will not fill up the momentum window and trigger
a second glide event.
* platform/mac/AxisScrollSnapAnimator.h:
* platform/mac/AxisScrollSnapAnimator.mm:
(WebCore::AxisScrollSnapAnimator::AxisScrollSnapAnimator):
(WebCore::AxisScrollSnapAnimator::handleWheelEvent):
(WebCore::AxisScrollSnapAnimator::scrollSnapAnimationUpdate):
(WebCore::AxisScrollSnapAnimator::endScrollSnapAnimation):
(WebCore::AxisScrollSnapAnimator::computeGlideDelta):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmacAxisScrollSnapAnimatorh">trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacAxisScrollSnapAnimatormm">trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172658 => 172659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-15 23:19:44 UTC (rev 172658)
+++ trunk/Source/WebCore/ChangeLog 2014-08-15 23:35:21 UTC (rev 172659)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-08-15 Wenson Hsieh <wenson_hsieh@apple.com>
+
+ Fix gliding in AxisScrollSnapAnimator for Mac
+ https://bugs.webkit.org/show_bug.cgi?id=135971
+
+ Reviewed by Dean Jackson.
+
+ Previously, momentum events that are handled immediately after finishing a glide animation cause a second, extremely
+ slow glide animation to trigger. To fix this, I added a new state DestinationReached. During this state, additional
+ momentum events that are handled after the glide animation completes will not fill up the momentum window and trigger
+ a second glide event.
+
+ * platform/mac/AxisScrollSnapAnimator.h:
+ * platform/mac/AxisScrollSnapAnimator.mm:
+ (WebCore::AxisScrollSnapAnimator::AxisScrollSnapAnimator):
+ (WebCore::AxisScrollSnapAnimator::handleWheelEvent):
+ (WebCore::AxisScrollSnapAnimator::scrollSnapAnimationUpdate):
+ (WebCore::AxisScrollSnapAnimator::endScrollSnapAnimation):
+ (WebCore::AxisScrollSnapAnimator::computeGlideDelta):
+
</ins><span class="cx"> 2014-08-15 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> [MSE] Implement a maximum buffer size for SourceBuffer
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacAxisScrollSnapAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h (172658 => 172659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h 2014-08-15 23:19:44 UTC (rev 172658)
+++ trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.h 2014-08-15 23:35:21 UTC (rev 172659)
</span><span class="lines">@@ -38,7 +38,8 @@
</span><span class="cx"> enum class ScrollSnapState {
</span><span class="cx"> Snapping,
</span><span class="cx"> Gliding,
</span><del>- Idle
</del><ins>+ DestinationReached,
+ UserInteraction
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> enum class WheelEventStatus {
</span><span class="lines">@@ -71,7 +72,7 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void beginScrollSnapAnimation(ScrollSnapState);
</span><del>- void endScrollSnapAnimation();
</del><ins>+ void endScrollSnapAnimation(ScrollSnapState);
</ins><span class="cx">
</span><span class="cx"> float computeSnapDelta() const;
</span><span class="cx"> float computeGlideDelta() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacAxisScrollSnapAnimatormm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm (172658 => 172659)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm 2014-08-15 23:19:44 UTC (rev 172658)
+++ trunk/Source/WebCore/platform/mac/AxisScrollSnapAnimator.mm 2014-08-15 23:35:21 UTC (rev 172659)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> : m_client(client)
</span><span class="cx"> , m_snapOffsets(snapOffsets)
</span><span class="cx"> , m_axis(axis)
</span><del>- , m_currentState(ScrollSnapState::Idle)
</del><ins>+ , m_currentState(ScrollSnapState::DestinationReached)
</ins><span class="cx"> , m_initialOffset(0)
</span><span class="cx"> , m_targetOffset(0)
</span><span class="cx"> , m_beginTrackingWheelDeltaOffset(0)
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> switch (wheelStatus) {
</span><span class="cx"> case WheelEventStatus::UserScrollBegin:
</span><span class="cx"> case WheelEventStatus::UserScrolling:
</span><del>- endScrollSnapAnimation();
</del><ins>+ endScrollSnapAnimation(ScrollSnapState::UserInteraction);
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WheelEventStatus::UserScrollEnd:
</span><span class="lines">@@ -117,15 +117,15 @@
</span><span class="cx">
</span><span class="cx"> case WheelEventStatus::InertialScrollBegin:
</span><span class="cx"> // Begin tracking wheel deltas for glide prediction.
</span><del>- endScrollSnapAnimation();
</del><ins>+ endScrollSnapAnimation(ScrollSnapState::UserInteraction);
</ins><span class="cx"> pushInitialWheelDelta(wheelDelta);
</span><span class="cx"> m_beginTrackingWheelDeltaOffset = m_client->scrollOffsetInAxis(m_axis);
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case WheelEventStatus::InertialScrolling:
</span><del>- if (m_currentState != ScrollSnapState::Gliding) {
- // FIXME: Investigate why small wheel deltas pushed into the window without the < -1, > 1 check.
- if (m_numWheelDeltasTracked < wheelDeltaWindowSize && (wheelDelta < -1 || wheelDelta > 1))
</del><ins>+ // This check for DestinationReached ensures that we don't receive another set of momentum events after ending the last glide.
+ if (m_currentState != ScrollSnapState::Gliding && m_currentState != ScrollSnapState::DestinationReached) {
+ if (m_numWheelDeltasTracked < wheelDeltaWindowSize)
</ins><span class="cx"> pushInitialWheelDelta(wheelDelta);
</span><span class="cx">
</span><span class="cx"> if (m_numWheelDeltasTracked == wheelDeltaWindowSize)
</span><span class="lines">@@ -155,10 +155,8 @@
</span><span class="cx"> float delta = m_currentState == ScrollSnapState::Snapping ? computeSnapDelta() : computeGlideDelta();
</span><span class="cx"> if (delta)
</span><span class="cx"> m_client->immediateScrollInAxis(m_axis, delta);
</span><del>- else {
- endScrollSnapAnimation();
- m_currentState = ScrollSnapState::Idle;
- }
</del><ins>+ else
+ endScrollSnapAnimation(ScrollSnapState::DestinationReached);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AxisScrollSnapAnimator::beginScrollSnapAnimation(ScrollSnapState newState)
</span><span class="lines">@@ -189,12 +187,13 @@
</span><span class="cx"> m_client->startScrollSnapTimer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void AxisScrollSnapAnimator::endScrollSnapAnimation()
</del><ins>+void AxisScrollSnapAnimator::endScrollSnapAnimation(ScrollSnapState newState)
</ins><span class="cx"> {
</span><ins>+ ASSERT(newState == ScrollSnapState::DestinationReached || newState == ScrollSnapState::UserInteraction);
</ins><span class="cx"> if (m_currentState == ScrollSnapState::Gliding)
</span><span class="cx"> clearInitialWheelDeltaWindow();
</span><span class="cx">
</span><del>- m_currentState = ScrollSnapState::Idle;
</del><ins>+ m_currentState = newState;
</ins><span class="cx"> m_client->stopScrollSnapTimer();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -245,7 +244,8 @@
</span><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> float progress = ((float)(offset - m_initialOffset)) / (m_targetOffset - m_initialOffset);
</span><del>- float shift = ceil(m_glideMagnitude * (1 + cos(piFloat * progress + m_glidePhaseShift)));
</del><ins>+ // FIXME: We might want to investigate why -m_glidePhaseShift results in the behavior we want.
+ float shift = ceil(m_glideMagnitude * (1 + cos(piFloat * progress - m_glidePhaseShift)));
</ins><span class="cx"> shift = m_initialOffset < m_targetOffset ? std::max<float>(shift, 1) : std::min<float>(shift, -1);
</span><span class="cx"> if ((m_initialOffset < m_targetOffset && offset + shift > m_targetOffset) || (m_initialOffset > m_targetOffset && offset + shift < m_targetOffset))
</span><span class="cx"> return m_targetOffset - offset;
</span></span></pre>
</div>
</div>
</body>
</html>