Restore handling of new scroll when waiting to cancel current scroll on cc

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

Index: third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
index bd79b7b907744087787dd9f84a1c5e77d541afb4..19b2a6df027ad62b317f03b77c6bf84ac2d41742 100644
--- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
+++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
@@ -446,4 +446,74 @@ TEST(ScrollAnimatorTest, CancellingAnimationResetsState)
     reset(*scrollAnimator);
 }
 
+// Test the behavior when in WaitingToCancelOnCompositor and a new user scroll
+// happens.
+TEST(ScrollAnimatorTest, CancellingCompositorAnimation)
+{
+    OwnPtrWillBeRawPtr<MockScrollableArea> scrollableArea = MockScrollableArea::create(true);
+    OwnPtrWillBeRawPtr<TestScrollAnimator> scrollAnimator = adoptPtrWillBeNoop(new TestScrollAnimator(scrollableArea.get(), getMockedTime));
+
+    EXPECT_CALL(*scrollableArea, minimumScrollPosition()).Times(AtLeast(1))
+        .WillRepeatedly(Return(IntPoint()));
+    EXPECT_CALL(*scrollableArea, maximumScrollPosition()).Times(AtLeast(1))
+        .WillRepeatedly(Return(IntPoint(1000, 1000)));
+    // Called when reset, not setting anywhere else.
+    EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(1);
+    // Called from first and last user scroll, and first update.
+    EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(3);
+    EXPECT_CALL(*scrollableArea, scheduleAnimation()).Times(AtLeast(1))
+        .WillRepeatedly(Return(true));

[jbroman, 2016/04/01 19:09:38]

These expectations are not actually verified, because the MockScrollableArea
outlives the test.

e.g. writing
EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(9000);

still passes. Suggest making sure that expectations are verified, e.g. by
forcing a collection in the test.

[ymalik, 2016/04/01 19:54:45]

Done. Thanks!

+
+    EXPECT_FALSE(scrollAnimator->hasAnimationThatRequiresService());
+
+    // First user 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());
+    EXPECT_EQ(100, scrollAnimator->desiredTargetPosition().x());
+    EXPECT_EQ(0, scrollAnimator->desiredTargetPosition().y());
+
+    // Update compositor animation.
+    gMockedTime += 0.05;
+    scrollAnimator->setShouldSendToCompositor(true);
+    scrollAnimator->updateCompositorAnimations();
+    EXPECT_EQ(scrollAnimator->m_runState,
+        ScrollAnimatorCompositorCoordinator::RunState::RunningOnCompositor);
+
+    // Cancel
+    scrollAnimator->cancelAnimation();
+    EXPECT_EQ(scrollAnimator->m_runState,
+        ScrollAnimatorCompositorCoordinator::RunState::WaitingToCancelOnCompositor);
+
+    // Second user scroll should not affect the run state.
+    result = scrollAnimator->userScroll(ScrollByLine, FloatSize(100, 0));
+    EXPECT_TRUE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_TRUE(result.didScrollX);
+    EXPECT_FLOAT_EQ(0.0, result.unusedScrollDeltaX);
+    EXPECT_EQ(scrollAnimator->m_runState,
+        ScrollAnimatorCompositorCoordinator::RunState::WaitingToCancelOnCompositor);
+    // Desired target position is what it was before.
+    EXPECT_EQ(100, scrollAnimator->desiredTargetPosition().x());
+    EXPECT_EQ(0, scrollAnimator->desiredTargetPosition().y());
+
+    // Update compositor animation.
+    gMockedTime += 0.05;
+    scrollAnimator->updateCompositorAnimations();
+    EXPECT_EQ(scrollAnimator->m_runState,
+        ScrollAnimatorCompositorCoordinator::RunState::Idle);
+
+    // Third user scroll after compositor update is treated like a new scroll.
+    result = scrollAnimator->userScroll(ScrollByLine, FloatSize(100, 0));
+    EXPECT_TRUE(scrollAnimator->hasAnimationThatRequiresService());
+    EXPECT_TRUE(result.didScrollX);
+    EXPECT_FLOAT_EQ(0.0, result.unusedScrollDeltaX);
+    EXPECT_EQ(scrollAnimator->m_runState,
+        ScrollAnimatorCompositorCoordinator::RunState::WaitingToSendToCompositor);
+    EXPECT_EQ(100, scrollAnimator->desiredTargetPosition().x());
+    EXPECT_EQ(0, scrollAnimator->desiredTargetPosition().y());
+    reset(*scrollAnimator);
+}
+
 } // namespace blink