Fix ScrollAnimator::hasRunningAnimation to account for the PostAnimationCleanup

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 583 matching lines @@
 TEST(ScrollAnimatorTest, MainThreadAnimationTargetAdjustment)
 {
     MockScrollableArea* scrollableArea = MockScrollableArea::create(true);
     ScrollAnimator* animator = new ScrollAnimator(scrollableArea, getMockedTime);
     scrollableArea->setScrollAnimator(animator);
 
     EXPECT_CALL(*scrollableArea, minimumScrollPosition()).Times(AtLeast(1))
         .WillRepeatedly(Return(IntPoint(-100, -100)));
     EXPECT_CALL(*scrollableArea, maximumScrollPosition()).Times(AtLeast(1))
         .WillRepeatedly(Return(IntPoint(1000, 1000)));
-    // Twice from tickAnimation, once from reset, and once from
+    // Twice from tickAnimation, once from reset, and twice from
     // adjustAnimationAndSetScrollPosition.
-    EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(4);
+    EXPECT_CALL(*scrollableArea, setScrollOffset(_, _)).Times(5);
     // One from call to userScroll and one from updateCompositorAnimations.
     EXPECT_CALL(*scrollableArea, registerForAnimation()).Times(2);
     EXPECT_CALL(*scrollableArea, scheduleAnimation()).Times(AtLeast(1))
         .WillRepeatedly(Return(true));
 
     // Idle
     EXPECT_FALSE(animator->hasAnimationThatRequiresService());
     EXPECT_EQ(FloatPoint(), animator->currentPosition());
 
     // WaitingToSendToCompositor
     animator->userScroll(ScrollByLine, FloatSize(100, 100));
 
     // RunningOnMainThread
     gMockedTime += 0.05;
     animator->updateCompositorAnimations();
     animator->tickAnimation(getMockedTime());
     FloatPoint pos = animator->currentPosition();
     EXPECT_EQ(FloatPoint(100, 100), animator->desiredTargetPosition());
     EXPECT_GT(pos.x(), 0);
     EXPECT_GT(pos.y(), 0);
 
     // Adjustment
     FloatPoint newPos = pos + FloatSize(10, -10);
     animator->adjustAnimationAndSetScrollPosition(newPos, AnchoringScroll);
     EXPECT_EQ(FloatPoint(110, 90), animator->desiredTargetPosition());
 
-    // Animation finished
+    // Adjusting after finished animation should do nothing.
     gMockedTime += 1.0;
     animator->updateCompositorAnimations();
     animator->tickAnimation(getMockedTime());
-    EXPECT_EQ(FloatPoint(110, 90), animator->currentPosition());
+    EXPECT_EQ(animator->runStateForTesting(),
+        ScrollAnimatorCompositorCoordinator::RunState::PostAnimationCleanup);
+    newPos = animator->currentPosition() + FloatSize(10, -10);
+    animator->adjustAnimationAndSetScrollPosition(newPos, AnchoringScroll);
+    EXPECT_EQ(animator->runStateForTesting(),
+        ScrollAnimatorCompositorCoordinator::RunState::PostAnimationCleanup);
+    EXPECT_EQ(FloatPoint(110, 90), animator->desiredTargetPosition());
+
     reset(*animator);
 
     // Forced GC in order to finalize objects depending on the mock object.
     ThreadState::current()-> collectAllGarbage();
 }
 
 } // namespace blink