| 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 60cbd81283394626de3ce6814cdfbb45b4814a1d..5fc75b0812fb03fc6f3071319bde330b8bb560b9 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimatorTest.cpp
|
| @@ -519,21 +519,23 @@ TEST(ScrollAnimatorTest, CancellingCompositorAnimation)
|
| 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());
|
| @@ -544,6 +546,12 @@ TEST(ScrollAnimatorTest, ImplOnlyAnimationUpdatesCleared)
|
| 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();
|
| }
|
|
|