Send takeover msg from MT to CC using the animation path.

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 70fa7f9c8fcd895a82bf3e86de76840c8ddab77a..534b91040472936147c7895dae44e761d3e1e3c0 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorCompositorCoordinator.cpp
@@ -22,6 +22,7 @@ ScrollAnimatorCompositorCoordinator::ScrollAnimatorCompositorCoordinator()
     , m_runState(RunState::Idle)
     , m_compositorAnimationId(0)
     , m_compositorAnimationGroupId(0)
+    , m_implOnlyAnimationTakeover(false)
 {
     ThreadState::current()->registerPreFinalizer(this);
     m_compositorPlayer = adoptPtr(CompositorFactory::current().createAnimationPlayer());
@@ -48,7 +49,7 @@ void ScrollAnimatorCompositorCoordinator::resetAnimationState()
 
 bool ScrollAnimatorCompositorCoordinator::hasAnimationThatRequiresService() const
 {
-    if (!m_implOnlyAnimationAdjustment.isZero())
+    if (hasImplOnlyAnimationUpdate())
         return true;
 
     switch (m_runState) {
@@ -119,10 +120,12 @@ void ScrollAnimatorCompositorCoordinator::cancelAnimation()
     }
 }
 
-void ScrollAnimatorCompositorCoordinator::takeoverCompositorAnimation()
+void ScrollAnimatorCompositorCoordinator::takeOverCompositorAnimation()
 {
     switch (m_runState) {
     case RunState::Idle:
+        takeOverImplOnlyScrollOffsetAnimation();
+        break;
     case RunState::WaitingToCancelOnCompositor:
     case RunState::WaitingToCancelOnCompositorButNewScroll:
     case RunState::PostAnimationCleanup:
@@ -242,23 +245,34 @@ FloatPoint ScrollAnimatorCompositorCoordinator::blinkOffsetFromCompositorOffset(
     return offset;
 }
 
+bool ScrollAnimatorCompositorCoordinator::hasImplOnlyAnimationUpdate() const
+{
+    return !m_implOnlyAnimationAdjustment.isZero() || m_implOnlyAnimationTakeover;
+}
+
 void ScrollAnimatorCompositorCoordinator::updateCompositorAnimations()
 {
-    if (!getScrollableArea()->scrollAnimatorEnabled() || m_implOnlyAnimationAdjustment.isZero())
+    if (!getScrollableArea()->scrollAnimatorEnabled() || !hasImplOnlyAnimationUpdate())
         return;
 
     GraphicsLayer* layer = getScrollableArea()->layerForScrolling();
     CompositorAnimationTimeline* timeline = getScrollableArea()->compositorAnimationTimeline();
     if (layer && timeline && !timeline->compositorAnimationHost().isNull()) {
         CompositorAnimationHost host = timeline->compositorAnimationHost();
-        host.updateImplOnlyScrollOffsetAnimation(
-            gfx::Vector2dF(m_implOnlyAnimationAdjustment.width(), m_implOnlyAnimationAdjustment.height()),
-            layer->platformLayer()->id());
+        int elementId = layer->platformLayer()->id();
+        if (!m_implOnlyAnimationAdjustment.isZero()) {
+            host.adjustImplOnlyScrollOffsetAnimation(
+                elementId,
+                gfx::Vector2dF(m_implOnlyAnimationAdjustment.width(), m_implOnlyAnimationAdjustment.height()));
+        }
+        if (m_implOnlyAnimationTakeover)
+            host.takeOverImplOnlyScrollOffsetAnimation(elementId);
     }
     m_implOnlyAnimationAdjustment = FloatSize();
+    m_implOnlyAnimationTakeover = false;
 }
 
-void ScrollAnimatorCompositorCoordinator::updateImplOnlyScrollOffsetAnimation(
+void ScrollAnimatorCompositorCoordinator::adjustImplOnlyScrollOffsetAnimation(
     const FloatSize& adjustment)
 {
     if (!getScrollableArea()->scrollAnimatorEnabled())
@@ -269,6 +283,16 @@ void ScrollAnimatorCompositorCoordinator::updateImplOnlyScrollOffsetAnimation(
     getScrollableArea()->registerForAnimation();
 }
 
+void ScrollAnimatorCompositorCoordinator::takeOverImplOnlyScrollOffsetAnimation()
+{
+    if (!getScrollableArea()->scrollAnimatorEnabled())
+        return;
+
+    m_implOnlyAnimationTakeover = true;
+
+    getScrollableArea()->registerForAnimation();
+}
+
 String ScrollAnimatorCompositorCoordinator::runStateAsText() const
 {
     switch (m_runState) {