Account for scroll origin in scroll animators.

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

 /*
  * Copyright (c) 2011, Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 131 matching lines @@
 
         m_targetOffset = targetPos;
         ASSERT(m_runState == RunState::RunningOnMainThread
             || m_runState == RunState::RunningOnCompositor
             || m_runState == RunState::RunningOnCompositorButNeedsUpdate
             || m_runState == RunState::RunningOnCompositorButNeedsTakeover);
 
         // Running on the main thread, simply update the target offset instead
         // of sending to the compositor.
         if (m_runState == RunState::RunningOnMainThread) {
-            m_animationCurve->updateTarget(m_timeFunction() - m_startTime, targetPos);
+            m_animationCurve->updateTarget(m_timeFunction() - m_startTime,
+                compositorOffsetFromBlinkOffset(targetPos));
             return true;
         }
 
         if (registerAndScheduleAnimation())
             m_runState = RunState::RunningOnCompositorButNeedsUpdate;
         return true;
     }
 
     if ((targetPos - currentPosition()).isZero())
         return false;
@@ skipping 17 matching lines @@
 
 void ScrollAnimator::tickAnimation(double monotonicTime)
 {
     if (m_runState != RunState::RunningOnMainThread)
         return;
 
     TRACE_EVENT0("blink", "ScrollAnimator::tickAnimation");
     double elapsedTime = monotonicTime - m_startTime;
 
     bool isFinished = (elapsedTime > m_animationCurve->duration());
-    FloatPoint offset = isFinished ? m_animationCurve->targetValue()
-        : m_animationCurve->getValue(elapsedTime);
+    FloatPoint offset = blinkOffsetFromCompositorOffset(isFinished
+        ? m_animationCurve->targetValue()
+        : m_animationCurve->getValue(elapsedTime));
 
     offset = FloatPoint(m_scrollableArea->clampScrollPosition(offset));
 
     m_currentPos = offset;
 
     if (isFinished)
         m_runState = RunState::PostAnimationCleanup;
     else
         scrollableArea()->scheduleAnimation();
 
@@ skipping 77 matching lines @@
         || m_runState == RunState::RunningOnCompositorButNeedsUpdate) {
         if (m_runState == RunState::RunningOnCompositorButNeedsUpdate) {
             // Abort the running animation before a new one with an updated
             // target is added.
             abortAnimation();
 
             m_compositorAnimationId = 0;
             m_compositorAnimationGroupId = 0;
 
             m_animationCurve->updateTarget(m_timeFunction() - m_startTime,
-                m_targetOffset);
+                compositorOffsetFromBlinkOffset(m_targetOffset));
             m_runState = RunState::WaitingToSendToCompositor;
         }
 
         if (!m_animationCurve) {
             m_animationCurve = adoptPtr(CompositorFactory::current().createScrollOffsetAnimationCurve(
-                m_targetOffset,
+                compositorOffsetFromBlinkOffset(m_targetOffset),
                 CompositorAnimationCurve::TimingFunctionTypeEaseInOut,
                 m_lastGranularity == ScrollByPixel ?
                     CompositorScrollOffsetAnimationCurve::ScrollDurationInverseDelta :
                     CompositorScrollOffsetAnimationCurve::ScrollDurationConstant));
-            m_animationCurve->setInitialValue(currentPosition());
+            m_animationCurve->setInitialValue(compositorOffsetFromBlinkOffset(currentPosition()));
         }
 
         bool runningOnMainThread = false;
         bool sentToCompositor = sendAnimationToCompositor();
         if (!sentToCompositor) {
             runningOnMainThread = registerAndScheduleAnimation();
             if (runningOnMainThread)
                 m_runState = RunState::RunningOnMainThread;
         }
 
@@ skipping 86 matching lines @@
     }
     return true;
 }
 
 DEFINE_TRACE(ScrollAnimator)
 {
     ScrollAnimatorBase::trace(visitor);
 }
 
 } // namespace blink