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

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

 /*
  * Copyright (C) 2010 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 296 matching lines @@
 {
     MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
     TestScrollAnimator* scrollAnimator = new TestScrollAnimator(scrollableArea, getMockedTime);
 
     EXPECT_CALL(*scrollableArea, minimumScrollPosition()).Times(AtLeast(1))
         .WillRepeatedly(Return(IntPoint()));
     EXPECT_CALL(*scrollableArea, maximumScrollPosition()).Times(AtLeast(1))
         .WillRepeatedly(Return(IntPoint(1000, 1000)));
     EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(2);
     // Called from userScroll, updateCompositorAnimations, then
-    // takeoverCompositorAnimation (to re-register after RunningOnCompositor).
+    // takeOverCompositorAnimation (to re-register after RunningOnCompositor).
     EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(3);
     EXPECT_CALL(*scrollableArea, scheduleAnimation()).Times(AtLeast(1))
         .WillRepeatedly(Return(true));
 
     EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
 
     // Smooth scroll.
     ScrollResult result = scrollAnimator->userScroll(ScrollByLine, FloatSize(100, 0));
     EXPECT_TRUE(scrollAnimator->hasAnimationThatRequiresService());
     EXPECT_TRUE(result.didScrollX);
     EXPECT_FLOAT_EQ(0.0, result.unusedScrollDeltaX);
     EXPECT_TRUE(scrollAnimator->hasRunningAnimation());
 
     // Update compositor animation.
     gMockedTime += 0.05;
     scrollAnimator->setShouldSendToCompositor(true);
     scrollAnimator->updateCompositorAnimations();
     EXPECT_EQ(scrollAnimator->m_runState,
         ScrollAnimatorCompositorCoordinator::RunState::RunningOnCompositor);
 
     // Takeover.
-    scrollAnimator->takeoverCompositorAnimation();
+    scrollAnimator->takeOverCompositorAnimation();
     EXPECT_EQ(scrollAnimator->m_runState,
         ScrollAnimatorCompositorCoordinator::RunState::RunningOnCompositorButNeedsTakeover);
 
     // Animation should now be running on the main thread.
     scrollAnimator->setShouldSendToCompositor(false);
     scrollAnimator->updateCompositorAnimations();
     EXPECT_EQ(scrollAnimator->m_runState,
         ScrollAnimatorCompositorCoordinator::RunState::RunningOnMainThread);
     scrollAnimator->tickAnimation(getMockedTime());
     EXPECT_NE(100, scrollAnimator->currentPosition().x());
@@ skipping 162 matching lines @@
     EXPECT_EQ(scrollAnimator->m_runState,
         ScrollAnimatorCompositorCoordinator::RunState::RunningOnCompositorButNeedsUpdate);
     EXPECT_EQ(250, scrollAnimator->desiredTargetPosition().x());
     EXPECT_EQ(0, scrollAnimator->desiredTargetPosition().y());
     reset(*scrollAnimator);
 
     // Forced GC in order to finalize objects depending on the mock object.
     ThreadHeap::collectAllGarbage();
 }
 
-// This test verifies that ImplOnlyAnimationUpdate gets cleared once its
-// pushed to compositor animation host.
+// This test verifies that impl only animation updates get cleared once they
+// are pushed to compositor animation host.
 TEST(ScrollAnimatorTest, ImplOnlyAnimationUpdatesCleared)
 {
     MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
     TestScrollAnimator* animator = new TestScrollAnimator(scrollableArea, getMockedTime);
 
-    EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(2);
+    // From calls to adjust/takeoverImplOnlyScrollOffsetAnimation.
+    EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(3);
 
+    // Verify that the adjustment update is cleared.
     EXPECT_EQ(animator->m_runState, ScrollAnimatorCompositorCoordinator::RunState::Idle);
     EXPECT_FALSE(animator->hasAnimationThatRequiresService());
     EXPECT_TRUE(animator->implOnlyAnimationAdjustmentForTesting().isZero());
 
-    animator->updateImplOnlyScrollOffsetAnimation(FloatSize(100.f, 100.f));
-    animator->updateImplOnlyScrollOffsetAnimation(FloatSize(10.f, -10.f));
+    animator->adjustImplOnlyScrollOffsetAnimation(FloatSize(100.f, 100.f));
+    animator->adjustImplOnlyScrollOffsetAnimation(FloatSize(10.f, -10.f));
 
     EXPECT_TRUE(animator->hasAnimationThatRequiresService());
     EXPECT_EQ(FloatSize(110.f, 90.f), animator->implOnlyAnimationAdjustmentForTesting());
 
     animator->updateCompositorAnimations();
 
     EXPECT_EQ(animator->m_runState, ScrollAnimatorCompositorCoordinator::RunState::Idle);
     EXPECT_FALSE(animator->hasAnimationThatRequiresService());
     EXPECT_TRUE(animator->implOnlyAnimationAdjustmentForTesting().isZero());
 
+    // Verify that the takeover update is cleared.
+    animator->takeOverImplOnlyScrollOffsetAnimation();
+    EXPECT_TRUE(animator->hasAnimationThatRequiresService());
+    animator->updateCompositorAnimations();
+    EXPECT_FALSE(animator->hasAnimationThatRequiresService());
+
     // Forced GC in order to finalize objects depending on the mock object.
     ThreadHeap::collectAllGarbage();
 }
 
 } // namespace blink