<!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>[194516] 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/194516">194516</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-01-03 12:06:48 -0800 (Sun, 03 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Minor cleanup in ScrollAnimator
https://bugs.webkit.org/show_bug.cgi?id=152656

Reviewed by Dan Bernstein.

Hide the fact that ScrollAnimator's m_currentPosX/m_currentPosY is not a FloatPoint
as much as possible.

Do offset -&gt; position conversion in ScrollAnimator::scrollToOffsetWithoutAnimation().
This is a behavior change, but I could never hit this code on Mac.

* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::scroll):
(WebCore::ScrollAnimator::scrollToOffsetWithoutAnimation):
(WebCore::ScrollAnimator::setCurrentPosition):
(WebCore::ScrollAnimator::updateActiveScrollSnapIndexForOffset):
(WebCore::ScrollAnimator::notifyPositionChanged):
(WebCore::ScrollAnimator::immediateScrollOnAxis):
(WebCore::ScrollAnimator::ScrollAnimator): Deleted.
(WebCore::ScrollAnimator::currentPosition): Deleted.
* platform/ScrollAnimator.h:
(WebCore::ScrollAnimator::ScrollAnimator::currentPosition):
(WebCore::ScrollAnimator::ScrollAnimator::setCurrentPositionInternal):
* platform/mac/ScrollAnimatorMac.mm:
(WebCore::ScrollAnimatorMac::scroll):
(WebCore::ScrollAnimatorMac::immediateScrollToPosition):
(WebCore::ScrollAnimatorMac::immediateScrollBy):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorcpp">trunk/Source/WebCore/platform/ScrollAnimator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorh">trunk/Source/WebCore/platform/ScrollAnimator.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacScrollAnimatorMacmm">trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194515 => 194516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-01-03 19:50:51 UTC (rev 194515)
+++ trunk/Source/WebCore/ChangeLog        2016-01-03 20:06:48 UTC (rev 194516)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2016-01-03  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Minor cleanup in ScrollAnimator
+        https://bugs.webkit.org/show_bug.cgi?id=152656
+
+        Reviewed by Dan Bernstein.
+
+        Hide the fact that ScrollAnimator's m_currentPosX/m_currentPosY is not a FloatPoint
+        as much as possible.
+        
+        Do offset -&gt; position conversion in ScrollAnimator::scrollToOffsetWithoutAnimation().
+        This is a behavior change, but I could never hit this code on Mac.
+
+        * platform/ScrollAnimator.cpp:
+        (WebCore::ScrollAnimator::scroll):
+        (WebCore::ScrollAnimator::scrollToOffsetWithoutAnimation):
+        (WebCore::ScrollAnimator::setCurrentPosition):
+        (WebCore::ScrollAnimator::updateActiveScrollSnapIndexForOffset):
+        (WebCore::ScrollAnimator::notifyPositionChanged):
+        (WebCore::ScrollAnimator::immediateScrollOnAxis):
+        (WebCore::ScrollAnimator::ScrollAnimator): Deleted.
+        (WebCore::ScrollAnimator::currentPosition): Deleted.
+        * platform/ScrollAnimator.h:
+        (WebCore::ScrollAnimator::ScrollAnimator::currentPosition):
+        (WebCore::ScrollAnimator::ScrollAnimator::setCurrentPositionInternal):
+        * platform/mac/ScrollAnimatorMac.mm:
+        (WebCore::ScrollAnimatorMac::scroll):
+        (WebCore::ScrollAnimatorMac::immediateScrollToPosition):
+        (WebCore::ScrollAnimatorMac::immediateScrollBy):
+
+2016-01-03  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
</ins><span class="cx">         Rename scrollPosition(Scrollbar*) to scrollOffset(ScrollbarOrientation)
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=152666
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (194515 => 194516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp        2016-01-03 19:50:51 UTC (rev 194515)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp        2016-01-03 20:06:48 UTC (rev 194516)
</span><span class="lines">@@ -52,8 +52,6 @@
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</span><span class="cx">     , m_scrollController(*this)
</span><span class="cx"> #endif
</span><del>-    , m_currentPosX(0)
-    , m_currentPosY(0)
</del><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -63,7 +61,7 @@
</span><span class="cx"> 
</span><span class="cx"> bool ScrollAnimator::scroll(ScrollbarOrientation orientation, ScrollGranularity, float step, float multiplier)
</span><span class="cx"> {
</span><del>-    FloatPoint currentPosition(m_currentPosX, m_currentPosY);
</del><ins>+    FloatPoint currentPosition = this-&gt;currentPosition();
</ins><span class="cx">     FloatSize delta;
</span><span class="cx">     if (orientation == HorizontalScrollbar)
</span><span class="cx">         delta.setWidth(step * multiplier);
</span><span class="lines">@@ -74,19 +72,16 @@
</span><span class="cx">     if (currentPosition == newPosition)
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    // FIXME: m_currentPosX/Y should just be a FloatPoint.
-    m_currentPosX = newPosition.x();
-    m_currentPosY = newPosition.y();
-
</del><ins>+    setCurrentPositionInternal(newPosition);
</ins><span class="cx">     notifyPositionChanged(newPosition - currentPosition);
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint&amp; offset)
</span><span class="cx"> {
</span><del>-    FloatSize delta = FloatSize(offset.x() - m_currentPosX, offset.y() - m_currentPosY);
-    m_currentPosX = offset.x();
-    m_currentPosY = offset.y();
</del><ins>+    FloatPoint newPositon = ScrollableArea::scrollPositionFromOffset(offset, toFloatSize(m_scrollableArea.scrollOrigin()));
+    FloatSize delta = newPositon - currentPosition();
+    setCurrentPositionInternal(newPositon);
</ins><span class="cx">     notifyPositionChanged(delta);
</span><span class="cx">     updateActiveScrollSnapIndexForOffset();
</span><span class="cx"> }
</span><span class="lines">@@ -177,19 +172,14 @@
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimator::setCurrentPosition(const FloatPoint&amp; position)
</span><span class="cx"> {
</span><del>-    m_currentPosX = position.x();
-    m_currentPosY = position.y();
</del><ins>+    setCurrentPositionInternal(position);
</ins><span class="cx">     updateActiveScrollSnapIndexForOffset();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-FloatPoint ScrollAnimator::currentPosition() const
-{
-    return FloatPoint(m_currentPosX, m_currentPosY);
-}
-
</del><span class="cx"> void ScrollAnimator::updateActiveScrollSnapIndexForOffset()
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><ins>+    // FIXME: Needs offset/position disambiguation.
</ins><span class="cx">     m_scrollController.setActiveScrollSnapIndicesForOffset(m_currentPosX, m_currentPosY);
</span><span class="cx">     if (m_scrollController.activeScrollSnapIndexDidChange()) {
</span><span class="cx">         m_scrollableArea.setCurrentHorizontalSnapPointIndex(m_scrollController.activeScrollSnapIndexForAxis(ScrollEventAxis::Horizontal));
</span><span class="lines">@@ -202,7 +192,7 @@
</span><span class="cx"> {
</span><span class="cx">     UNUSED_PARAM(delta);
</span><span class="cx">     // FIXME: need to not map back and forth all the time.
</span><del>-    m_scrollableArea.setScrollOffsetFromAnimation(m_scrollableArea.scrollOffsetFromPosition(IntPoint(m_currentPosX, m_currentPosY)));
</del><ins>+    m_scrollableArea.setScrollOffsetFromAnimation(m_scrollableArea.scrollOffsetFromPosition(roundedIntPoint(currentPosition())));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP)
</span><span class="lines">@@ -218,11 +208,13 @@
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimator::immediateScrollOnAxis(ScrollEventAxis axis, float delta)
</span><span class="cx"> {
</span><del>-    FloatPoint currentPosition = this-&gt;currentPosition();
</del><ins>+    FloatSize deltaSize;
</ins><span class="cx">     if (axis == ScrollEventAxis::Horizontal)
</span><del>-        scrollToOffsetWithoutAnimation(FloatPoint(currentPosition.x() + delta, currentPosition.y()));
</del><ins>+        deltaSize.setWidth(delta);
</ins><span class="cx">     else
</span><del>-        scrollToOffsetWithoutAnimation(FloatPoint(currentPosition.x(), currentPosition.y() + delta));
</del><ins>+        deltaSize.setHeight(delta);
+
+    scrollToOffsetWithoutAnimation(currentPosition() + deltaSize);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> LayoutSize ScrollAnimator::scrollExtent() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.h (194515 => 194516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.h        2016-01-03 19:50:51 UTC (rev 194515)
+++ trunk/Source/WebCore/platform/ScrollAnimator.h        2016-01-03 20:06:48 UTC (rev 194516)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #ifndef ScrollAnimator_h
</span><span class="cx"> #define ScrollAnimator_h
</span><span class="cx"> 
</span><del>-#include &quot;FloatSize.h&quot;
</del><ins>+#include &quot;FloatPoint.h&quot;
</ins><span class="cx"> #include &quot;LayoutUnit.h&quot;
</span><span class="cx"> #include &quot;PlatformWheelEvent.h&quot;
</span><span class="cx"> #include &quot;ScrollTypes.h&quot;
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><span class="cx">     void setCurrentPosition(const FloatPoint&amp;);
</span><del>-    FloatPoint currentPosition() const;
</del><ins>+    FloatPoint currentPosition() const { return FloatPoint(m_currentPosX, m_currentPosY); }
</ins><span class="cx"> 
</span><span class="cx">     virtual void cancelAnimations() { }
</span><span class="cx">     virtual void serviceScrollAnimations() { }
</span><span class="lines">@@ -145,13 +145,19 @@
</span><span class="cx">     virtual void notifyPositionChanged(const FloatSize&amp; delta);
</span><span class="cx">     void updateActiveScrollSnapIndexForOffset();
</span><span class="cx"> 
</span><ins>+    void setCurrentPositionInternal(const FloatPoint&amp; p)
+    {
+        m_currentPosX = p.x();
+        m_currentPosY = p.y();
+    }
+
</ins><span class="cx">     ScrollableArea&amp; m_scrollableArea;
</span><span class="cx">     RefPtr&lt;WheelEventTestTrigger&gt; m_wheelEventTestTrigger;
</span><span class="cx"> #if ENABLE(CSS_SCROLL_SNAP) || ENABLE(RUBBER_BANDING)
</span><span class="cx">     ScrollController m_scrollController;
</span><span class="cx"> #endif
</span><del>-    float m_currentPosX; // We avoid using a FloatPoint in order to reduce
-    float m_currentPosY; // subclass code complexity.
</del><ins>+    float m_currentPosX { 0 }; // ScrollAnimatorNone takes addresses of these, so can't use a FloatPoint.
+    float m_currentPosY { 0 };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacScrollAnimatorMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm (194515 => 194516)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm        2016-01-03 19:50:51 UTC (rev 194515)
+++ trunk/Source/WebCore/platform/mac/ScrollAnimatorMac.mm        2016-01-03 20:06:48 UTC (rev 194516)
</span><span class="lines">@@ -702,7 +702,7 @@
</span><span class="cx">     if (granularity == ScrollByPixel)
</span><span class="cx">         return ScrollAnimator::scroll(orientation, granularity, step, multiplier);
</span><span class="cx"> 
</span><del>-    FloatPoint currentPosition(m_currentPosX, m_currentPosY);
</del><ins>+    FloatPoint currentPosition = this-&gt;currentPosition();
</ins><span class="cx">     FloatSize delta;
</span><span class="cx">     if (orientation == HorizontalScrollbar)
</span><span class="cx">         delta.setWidth(step * multiplier);
</span><span class="lines">@@ -721,7 +721,7 @@
</span><span class="cx">             newPosition.setX(targetOrigin.x);
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    LOG_WITH_STREAM(Scrolling, stream &lt;&lt; &quot;ScrollAnimatorMac::scroll &quot; &lt;&lt; &quot; from &quot; &lt;&lt; FloatPoint(m_currentPosX, m_currentPosY) &lt;&lt; &quot; to &quot; &lt;&lt; newPosition);
</del><ins>+    LOG_WITH_STREAM(Scrolling, stream &lt;&lt; &quot;ScrollAnimatorMac::scroll &quot; &lt;&lt; &quot; from &quot; &lt;&lt; currentPosition &lt;&lt; &quot; to &quot; &lt;&lt; newPosition);
</ins><span class="cx">     [m_scrollAnimationHelper scrollToPoint:newPosition];
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="lines">@@ -755,16 +755,15 @@
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimatorMac::immediateScrollToPosition(const FloatPoint&amp; newPosition)
</span><span class="cx"> {
</span><ins>+    FloatPoint currentPosition = this-&gt;currentPosition();
</ins><span class="cx">     FloatPoint adjustedPosition = adjustScrollPositionIfNecessary(newPosition);
</span><span class="cx">  
</span><del>-    bool positionChanged = adjustedPosition.x() != m_currentPosX || adjustedPosition.y() != m_currentPosY;
</del><ins>+    bool positionChanged = adjustedPosition != currentPosition;
</ins><span class="cx">     if (!positionChanged &amp;&amp; !scrollableArea().scrollOriginChanged())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    FloatSize delta = FloatSize(adjustedPosition.x() - m_currentPosX, adjustedPosition.y() - m_currentPosY);
-
-    m_currentPosX = adjustedPosition.x();
-    m_currentPosY = adjustedPosition.y();
</del><ins>+    FloatSize delta = adjustedPosition - currentPosition;
+    setCurrentPositionInternal(adjustedPosition);
</ins><span class="cx">     notifyPositionChanged(delta);
</span><span class="cx">     updateActiveScrollSnapIndexForOffset();
</span><span class="cx"> }
</span><span class="lines">@@ -1299,14 +1298,13 @@
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimatorMac::immediateScrollBy(const FloatSize&amp; delta)
</span><span class="cx"> {
</span><del>-    FloatPoint newPos = adjustScrollPositionIfNecessary(FloatPoint(m_currentPosX, m_currentPosY) + delta);
-    if (newPos.x() == m_currentPosX &amp;&amp; newPos.y() == m_currentPosY)
</del><ins>+    FloatPoint currentPosition = this-&gt;currentPosition();
+    FloatPoint newPosition = adjustScrollPositionIfNecessary(currentPosition + delta);
+    if (newPosition == currentPosition)
</ins><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    FloatSize adjustedDelta = FloatSize(newPos.x() - m_currentPosX, newPos.y() - m_currentPosY);
-
-    m_currentPosX = newPos.x();
-    m_currentPosY = newPos.y();
</del><ins>+    FloatSize adjustedDelta = newPosition - currentPosition;
+    setCurrentPositionInternal(newPosition);
</ins><span class="cx">     notifyPositionChanged(adjustedDelta);
</span><span class="cx">     updateActiveScrollSnapIndexForOffset();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>