<!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>[194507] 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/194507">194507</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-02 21:03:00 -0800 (Sat, 02 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Some cleanup in ScrollAnimator
https://bugs.webkit.org/show_bug.cgi?id=152649
Try to fix GTK test failures. ScrollAnimatorNone needs to map correctly between
min and max scroll positions.
* platform/ScrollAnimatorNone.cpp:
(WebCore::ScrollAnimatorNone::PerAxisData::updateDataFromParameters):
(WebCore::ScrollAnimatorNone::scroll):
* platform/ScrollAnimatorNone.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorNonecpp">trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorNoneh">trunk/Source/WebCore/platform/ScrollAnimatorNone.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194506 => 194507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-03 00:39:41 UTC (rev 194506)
+++ trunk/Source/WebCore/ChangeLog 2016-01-03 05:03:00 UTC (rev 194507)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-02 Simon Fraser <simon.fraser@apple.com>
+
+ Some cleanup in ScrollAnimator
+ https://bugs.webkit.org/show_bug.cgi?id=152649
+
+ Try to fix GTK test failures. ScrollAnimatorNone needs to map correctly between
+ min and max scroll positions.
+
+ * platform/ScrollAnimatorNone.cpp:
+ (WebCore::ScrollAnimatorNone::PerAxisData::updateDataFromParameters):
+ (WebCore::ScrollAnimatorNone::scroll):
+ * platform/ScrollAnimatorNone.h:
+
</ins><span class="cx"> 2016-01-02 Max Stepin <maxstepin@gmail.com>
</span><span class="cx">
</span><span class="cx"> APNG decoder: only decode the frames up to haltAtFrame
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorNonecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp (194506 => 194507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2016-01-03 00:39:41 UTC (rev 194506)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.cpp 2016-01-03 05:03:00 UTC (rev 194507)
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-bool ScrollAnimatorNone::PerAxisData::updateDataFromParameters(float step, float multiplier, float scrollableSize, double currentTime, Parameters* parameters)
</del><ins>+bool ScrollAnimatorNone::PerAxisData::updateDataFromParameters(float step, float multiplier, float minScrollPosition, float maxScrollPosition, double currentTime, Parameters* parameters)
</ins><span class="cx"> {
</span><span class="cx"> float delta = step * multiplier;
</span><span class="cx"> if (!m_startTime || !delta || (delta < 0) != (m_desiredPosition - *m_currentPosition < 0)) {
</span><span class="lines">@@ -235,8 +235,7 @@
</span><span class="cx"> }
</span><span class="cx"> float newPosition = m_desiredPosition + delta;
</span><span class="cx">
</span><del>- if (newPosition < 0 || newPosition > scrollableSize)
- newPosition = max(min(newPosition, scrollableSize), 0.0f);
</del><ins>+ newPosition = max(min(newPosition, maxScrollPosition), minScrollPosition);
</ins><span class="cx">
</span><span class="cx"> if (newPosition == m_desiredPosition)
</span><span class="cx"> return false;
</span><span class="lines">@@ -426,10 +425,18 @@
</span><span class="cx"> return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
</span><span class="cx">
</span><span class="cx"> // This is an animatable scroll. Set the animation in motion using the appropriate parameters.
</span><del>- float scrollableSize = static_cast<float>(m_scrollableArea.scrollSize(orientation));
</del><ins>+ float minScrollPosition;
+ float maxScrollPosition;
+ if (orientation == HorizontalScrollbar) {
+ minScrollPosition = m_scrollableArea.minimumScrollPosition().x();
+ maxScrollPosition = m_scrollableArea.maximumScrollPosition().x();
+ } else {
+ minScrollPosition = m_scrollableArea.minimumScrollPosition().y();
+ maxScrollPosition = m_scrollableArea.maximumScrollPosition().y();
+ }
</ins><span class="cx">
</span><span class="cx"> PerAxisData& data = (orientation == VerticalScrollbar) ? m_verticalData : m_horizontalData;
</span><del>- bool needToScroll = data.updateDataFromParameters(step, multiplier, scrollableSize, monotonicallyIncreasingTime(), &parameters);
</del><ins>+ bool needToScroll = data.updateDataFromParameters(step, multiplier, minScrollPosition, maxScrollPosition, monotonicallyIncreasingTime(), &parameters);
</ins><span class="cx"> if (needToScroll && !animationTimerActive()) {
</span><span class="cx"> m_startTime = data.m_startTime;
</span><span class="cx"> animationWillStart();
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorNoneh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimatorNone.h (194506 => 194507)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2016-01-03 00:39:41 UTC (rev 194506)
+++ trunk/Source/WebCore/platform/ScrollAnimatorNone.h 2016-01-03 05:03:00 UTC (rev 194507)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> struct PerAxisData {
</span><span class="cx"> PerAxisData(ScrollAnimatorNone* parent, float* currentPos, int visibleLength);
</span><span class="cx"> void reset();
</span><del>- bool updateDataFromParameters(float step, float multiplier, float scrollableSize, double currentTime, Parameters*);
</del><ins>+ bool updateDataFromParameters(float step, float multiplier, float minScrollPosition, float maxScrollPosition, double currentTime, Parameters*);
</ins><span class="cx"> bool animateScroll(double currentTime);
</span><span class="cx"> void updateVisibleLength(int visibleLength);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>