Use float for scroll offset.

third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.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/ScrollAnimatorCompositorCoordinator.h"
 
 #include "cc/animation/scroll_offset_animation_curve.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/animation/CompositorAnimation.h"
 #include "platform/animation/CompositorAnimationHost.h"
@@ skipping 219 matching lines @@
   // animation.
   notifyCompositorAnimationFinished(group);
 }
 
 CompositorAnimationPlayer*
 ScrollAnimatorCompositorCoordinator::compositorPlayer() const {
   return m_compositorPlayer.get();
 }
 
 FloatPoint ScrollAnimatorCompositorCoordinator::compositorOffsetFromBlinkOffset(
-    FloatPoint offset) {
-  offset.moveBy(getScrollableArea()->scrollOrigin());
-  return offset;
+    ScrollOffset offset) {
+  return getScrollableArea()->scrollOrigin() + offset;
 }
 
-FloatPoint ScrollAnimatorCompositorCoordinator::blinkOffsetFromCompositorOffset(
+ScrollOffset
+ScrollAnimatorCompositorCoordinator::blinkOffsetFromCompositorOffset(
     FloatPoint offset) {
-  offset.moveBy(-getScrollableArea()->scrollOrigin());
-  return offset;
+  return offset - getScrollableArea()->scrollOrigin();
 }
 
 bool ScrollAnimatorCompositorCoordinator::hasImplOnlyAnimationUpdate() const {
   return !m_implOnlyAnimationAdjustment.isZero() || m_implOnlyAnimationTakeover;
 }
 
 void ScrollAnimatorCompositorCoordinator::updateImplOnlyCompositorAnimations() {
   if (!hasImplOnlyAnimationUpdate())
     return;
 
@@ skipping 15 matching lines @@
   m_implOnlyAnimationTakeover = false;
 }
 
 void ScrollAnimatorCompositorCoordinator::updateCompositorAnimations() {
   if (!getScrollableArea()->scrollAnimatorEnabled())
     return;
 
   updateImplOnlyCompositorAnimations();
 }
 
-void ScrollAnimatorCompositorCoordinator::scrollPositionChanged(
-    const DoublePoint& offset,
+void ScrollAnimatorCompositorCoordinator::scrollOffsetChanged(
+    const ScrollOffset& offset,
     ScrollType scrollType) {
-  getScrollableArea()->scrollPositionChanged(offset, scrollType);
+  getScrollableArea()->scrollOffsetChanged(offset, scrollType);
 }
 
-void ScrollAnimatorCompositorCoordinator::adjustAnimationAndSetScrollPosition(
-    const DoublePoint& position,
+void ScrollAnimatorCompositorCoordinator::adjustAnimationAndSetScrollOffset(
+    const ScrollOffset& offset,
     ScrollType scrollType) {
   // Subclasses should override this and adjust the animation as necessary.
-  scrollPositionChanged(position, scrollType);
+  scrollOffsetChanged(offset, scrollType);
 }
 
 void ScrollAnimatorCompositorCoordinator::adjustImplOnlyScrollOffsetAnimation(
     const IntSize& adjustment) {
   if (!getScrollableArea()->scrollAnimatorEnabled())
     return;
 
   m_implOnlyAnimationAdjustment.expand(adjustment.width(), adjustment.height());
 
   getScrollableArea()->registerForAnimation();
@@ skipping 35 matching lines @@
     case RunState::WaitingToCancelOnCompositorButNewScroll:
       return String("WaitingToCancelOnCompositorButNewScroll");
     case RunState::RunningOnCompositorButNeedsAdjustment:
       return String("RunningOnCompositorButNeedsAdjustment");
   }
   ASSERT_NOT_REACHED();
   return String();
 }
 
 }  // namespace blink