Remove ScrollableArea::notifyScrollPositionChanged and cleanup scroll animators.

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 "config.h"
 #include "platform/scroll/ProgrammaticScrollAnimator.h"
 
 #include "platform/geometry/IntPoint.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/scroll/ScrollableArea.h"
@@ skipping 24 matching lines @@
 
 void ProgrammaticScrollAnimator::resetAnimationState()
 {
     m_animationCurve.clear();
     m_startTime = 0.0;
     m_runState = RunState::Idle;
     m_compositorAnimationId = 0;
     m_compositorAnimationGroupId = 0;
 }
 
+void ProgrammaticScrollAnimator::notifyPositionChanged(const DoublePoint& offset)
+{
+    m_scrollableArea->scrollPositionChanged(offset, ProgrammaticScroll);
+}
+
+void ProgrammaticScrollAnimator::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
+{
+    cancelAnimation();
+    notifyPositionChanged(offset);
+}
+
 void ProgrammaticScrollAnimator::animateToOffset(FloatPoint offset)
 {
     m_startTime = 0.0;
     m_targetOffset = offset;
     m_animationCurve = adoptPtr(Platform::current()->compositorSupport()->createScrollOffsetAnimationCurve(m_targetOffset, WebCompositorAnimationCurve::TimingFunctionTypeEaseInOut));
 
     m_animationCurve->setInitialValue(FloatPoint(m_scrollableArea->scrollPosition()));
     m_scrollableArea->registerForAnimation();
     if (!m_scrollableArea->scheduleAnimation()) {
         resetAnimationState();
-        m_scrollableArea->notifyScrollPositionChanged(IntPoint(offset.x(), offset.y()));
+        notifyPositionChanged(IntPoint(offset.x(), offset.y()));
     }
     m_runState = RunState::WaitingToSendToCompositor;
 }
 
 void ProgrammaticScrollAnimator::cancelAnimation()
 {
     switch (m_runState) {
     case RunState::Idle:
     case RunState::WaitingToCancelOnCompositor:
         break;
@@ skipping 19 matching lines @@
 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);
-    m_scrollableArea->notifyScrollPositionChanged(IntPoint(offset.x(), offset.y()));
+    notifyPositionChanged(IntPoint(offset.x(), offset.y()));
 
     if (isFinished) {
         resetAnimationState();
     } else if (!m_scrollableArea->scheduleAnimation()) {
-        m_scrollableArea->notifyScrollPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
+        notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
         resetAnimationState();
     }
 }
 
 bool ProgrammaticScrollAnimator::hasAnimationThatRequiresService() const
 {
     switch (m_runState) {
     case RunState::Idle:
     case RunState::RunningOnCompositor:
         return false;
@@ skipping 38 matching lines @@
                     m_runState = RunState::RunningOnCompositor;
                     m_compositorAnimationId = animationId;
                     m_compositorAnimationGroupId = animationGroupId;
                 }
             }
         }
 
         if (!sentToCompositor) {
             m_runState = RunState::RunningOnMainThread;
             if (!m_scrollableArea->scheduleAnimation()) {
-                m_scrollableArea->notifyScrollPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
+                notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
                 resetAnimationState();
             }
         }
     }
 }
 
 void ProgrammaticScrollAnimator::layerForCompositedScrollingDidChange()
 {
     // 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_scrollableArea->registerForAnimation();
         if (!m_scrollableArea->scheduleAnimation()) {
             resetAnimationState();
-            m_scrollableArea->notifyScrollPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
+            notifyPositionChanged(IntPoint(m_targetOffset.x(), m_targetOffset.y()));
         }
     }
 }
 
 void ProgrammaticScrollAnimator::notifyCompositorAnimationFinished(int groupId)
 {
     if (m_compositorAnimationGroupId != groupId)
         return;
 
     m_compositorAnimationId = 0;
     m_compositorAnimationGroupId = 0;
 
     switch (m_runState) {
     case RunState::Idle:
     case RunState::RunningOnMainThread:
         ASSERT_NOT_REACHED();
         break;
     case RunState::WaitingToSendToCompositor:
         break;
     case RunState::RunningOnCompositor:
     case RunState::WaitingToCancelOnCompositor:
         resetAnimationState();
     }
 }
 
 } // namespace blink