Account for scroll origin in scroll animators.

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

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
index 27dfece11f6ad9c1e092ba88961e180ddb50ae6b..690cc059858f8b1795ee186ed05fea1c2ed4877a 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
@@ -246,4 +246,16 @@ CompositorAnimationPlayer* ScrollAnimatorCompositorCoordinator::compositorPlayer
     return m_compositorPlayer.get();
 }
 
+FloatPoint ScrollAnimatorCompositorCoordinator::compositorOffsetFromBlinkOffset(FloatPoint offset)
+{
+    offset.moveBy(scrollableArea()->scrollOrigin());
+    return offset;
+}
+
+FloatPoint ScrollAnimatorCompositorCoordinator::blinkOffsetFromCompositorOffset(FloatPoint offset)
+{
+    offset.moveBy(-scrollableArea()->scrollOrigin());
+    return offset;
+}
+
 } // namespace blink