Account for scroll origin in scroll animators.

third_party/WebKit/Source/platform/scroll/ProgrammaticScrollAnimator.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/scroll/ProgrammaticScrollAnimator.h"
 
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/animation/CompositorScrollOffsetAnimationCurve.h"
 #include "platform/geometry/IntPoint.h"
 #include "platform/graphics/CompositorFactory.h"
@@ skipping 38 matching lines @@
 }
 
 void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset)
 {
     if (m_runState == RunState::PostAnimationCleanup)
         resetAnimationState();
 
     m_startTime = 0.0;
     m_targetOffset = offset;
     m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetAnimationCurve(
-        m_targetOffset,
+        compositorOffsetFromBlinkOffset(m_targetOffset),
         CompositorAnimationCurve::TimingFunctionTypeEaseInOut,
         CompositorScrollOffsetAnimationCurve::ScrollDurationDeltaBased));
 
     m_scrollableArea->registerForAnimation();
     if (!m_scrollableArea->scheduleAnimation()) {
         resetAnimationState();
         notifyPositionChanged(IntPoint(offset.x(), offset.y()));
     }
     m_runState = RunState::WaitingToSendToCompositor;
 }
 
 void ProgrammaticScrollAnimator::cancelAnimation()
 {
     ASSERT(m_runState != RunState::RunningOnCompositorButNeedsUpdate);
     ScrollAnimatorCompositorCoordinator::cancelAnimation();
 }
 
 void ProgrammaticScrollAnimator::tickAnimation(double monotonicTime)
 {
     if (m_runState != RunState::RunningOnMainThread)
         return;
 
     if (!m_startTime)
         m_startTime = monotonicTime;
     double elapsedTime = monotonicTime - m_startTime;
     bool isFinished = (elapsedTime > m_animationCurve->duration());
-    FloatPoint offset = m_animationCurve->getValue(elapsedTime);
+    FloatPoint offset = blinkOffsetFromCompositorOffset(m_animationCurve->getValue(elapsedTime));
     notifyPositionChanged(IntPoint(offset.x(), offset.y()));
 
     if (isFinished) {
         m_runState = RunState::PostAnimationCleanup;
     } else if (!m_scrollableArea->scheduleAnimation()) {
         notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
         resetAnimationState();
     }
 }
 
@@ skipping 35 matching lines @@
             if (addAnimation(animation.release())) {
                 sentToCompositor = true;
                 m_runState = RunState::RunningOnCompositor;
                 m_compositorAnimationId = animationId;
                 m_compositorAnimationGroupId = animationGroupId;
             }
         }
 
         if (!sentToCompositor) {
             m_runState = RunState::RunningOnMainThread;
-            m_animationCurve->setInitialValue(FloatPoint(m_scrollableArea->scrollPosition()));
+            m_animationCurve->setInitialValue(compositorOffsetFromBlinkOffset(
+                FloatPoint(m_scrollableArea->scrollPosition())));
             if (!m_scrollableArea->scheduleAnimation()) {
                 notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
                 resetAnimationState();
             }
         }
     }
 }
 
 void ProgrammaticScrollAnimator::layerForCompositedScrollingDidChange(CompositorAnimationTimeline* timeline)
 {
     reattachCompositorPlayerIfNeeded(timeline);
 
     // If the composited scrolling layer is lost during a composited animation,
     // continue the animation on the main thread.
     if (m_runState == RunState::RunningOnCompositor && !m_scrollableArea->layerForScrolling()) {
         m_runState = RunState::RunningOnMainThread;
         m_compositorAnimationId = 0;
         m_compositorAnimationGroupId = 0;
-        m_animationCurve->setInitialValue(FloatPoint(m_scrollableArea->scrollPosition()));
+        m_animationCurve->setInitialValue(compositorOffsetFromBlinkOffset(
+            FloatPoint(m_scrollableArea->scrollPosition())));
         m_scrollableArea->registerForAnimation();
         if (!m_scrollableArea->scheduleAnimation()) {
             resetAnimationState();
             notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
         }
     }
 }
 
 void ProgrammaticScrollAnimator::notifyCompositorAnimationFinished(int groupId)
 {
     ASSERT(m_runState != RunState::RunningOnCompositorButNeedsUpdate);
     ScrollAnimatorCompositorCoordinator::compositorAnimationFinished(groupId);
 }
 
 DEFINE_TRACE(ProgrammaticScrollAnimator)
 {
     visitor->trace(m_scrollableArea);
     ScrollAnimatorCompositorCoordinator::trace(visitor);
 }
 
 } // namespace blink