Remove ScrollableArea::notifyScrollPositionChanged and cleanup scroll animators.

Source/platform/scroll/ScrollAnimatorNone.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 415 matching lines @@
     bool needToScroll = data.updateDataFromParameters(step, delta, scrollableSize, WTF::monotonicallyIncreasingTime(), &parameters);
     if (needToScroll && !animationTimerActive()) {
         m_startTime = data.m_startTime;
         animationWillStart();
         animationTimerFired();
         scrollableArea()->registerForAnimation();
     }
     return ScrollResultOneDimensional(needToScroll);
 }
 
-void ScrollAnimatorNone::scrollToOffsetWithoutAnimation(const FloatPoint& offset, ScrollType scrollType)
+void ScrollAnimatorNone::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
 {
-    stopAnimationTimerIfNeeded();
-
-    m_horizontalData.reset();
-    *m_horizontalData.m_currentPosition = offset.x();
-    m_horizontalData.m_desiredPosition = offset.x();
     m_currentPosX = offset.x();
-
-    m_verticalData.reset();
-    *m_verticalData.m_currentPosition = offset.y();
-    m_verticalData.m_desiredPosition = offset.y();
     m_currentPosY = offset.y();
 
-    notifyPositionChanged(scrollType);
+    // Must be called after setting the position since canceling the animation resets
+    // the desired position to the current.
+    cancelAnimations();
+    notifyPositionChanged();
 }
 
 void ScrollAnimatorNone::cancelAnimations()
 {
     m_animationActive = false;
+
+    m_horizontalData.reset();
+    m_verticalData.reset();
+    m_horizontalData.m_desiredPosition = m_currentPosX;
+    m_verticalData.m_desiredPosition = m_currentPosY;
 }
 
 void ScrollAnimatorNone::serviceScrollAnimations()
 {
     if (m_animationActive)
         animationTimerFired();
 }
 
 bool ScrollAnimatorNone::hasRunningAnimation() const
 {
@@ skipping 37 matching lines @@
         continueAnimation = true;
     if (m_verticalData.m_startTime && m_verticalData.animateScroll(currentTime))
         continueAnimation = true;
 
     if (continueAnimation)
         startNextTimer();
     else
         m_animationActive = false;
 
     TRACE_EVENT0("blink", "ScrollAnimatorNone::notifyPositionChanged");
-    notifyPositionChanged(UserScroll);
+    notifyPositionChanged();
 
     if (!continueAnimation)
         animationDidFinish();
 }
 
 void ScrollAnimatorNone::startNextTimer()
 {
     if (scrollableArea()->scheduleAnimation())
         m_animationActive = true;
 }
 
 bool ScrollAnimatorNone::animationTimerActive()
 {
     return m_animationActive;
 }
 
 void ScrollAnimatorNone::stopAnimationTimerIfNeeded()
 {
     if (animationTimerActive())
         m_animationActive = false;
 }
 
 } // namespace blink