| Index: third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
|
| index f8c07de75bb1911cf232af397fd862a3a4a9446f..9600691d4a707130a5c95b17fb6dbf6c6bd25d0e 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayerTest.cpp
|
| @@ -102,7 +102,7 @@ class AnimationPlayerForTesting : public CompositorAnimationPlayerClient {
|
| };
|
|
|
| TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations) {
|
| - ASSERT_FALSE(m_platformLayer->hasActiveAnimationForTesting());
|
| + ASSERT_FALSE(m_platformLayer->hasTickingAnimationForTesting());
|
|
|
| std::unique_ptr<CompositorFloatAnimationCurve> curve =
|
| CompositorFloatAnimationCurve::create();
|
| @@ -129,23 +129,23 @@ TEST_F(GraphicsLayerTest, updateLayerShouldFlattenTransformWithAnimations) {
|
|
|
| player.compositorPlayer()->addAnimation(std::move(floatAnimation));
|
|
|
| - ASSERT_TRUE(m_platformLayer->hasActiveAnimationForTesting());
|
| + ASSERT_TRUE(m_platformLayer->hasTickingAnimationForTesting());
|
|
|
| m_graphicsLayer->setShouldFlattenTransform(false);
|
|
|
| m_platformLayer = m_graphicsLayer->platformLayer();
|
| ASSERT_TRUE(m_platformLayer);
|
|
|
| - ASSERT_TRUE(m_platformLayer->hasActiveAnimationForTesting());
|
| + ASSERT_TRUE(m_platformLayer->hasTickingAnimationForTesting());
|
| player.compositorPlayer()->removeAnimation(animationId);
|
| - ASSERT_FALSE(m_platformLayer->hasActiveAnimationForTesting());
|
| + ASSERT_FALSE(m_platformLayer->hasTickingAnimationForTesting());
|
|
|
| m_graphicsLayer->setShouldFlattenTransform(true);
|
|
|
| m_platformLayer = m_graphicsLayer->platformLayer();
|
| ASSERT_TRUE(m_platformLayer);
|
|
|
| - ASSERT_FALSE(m_platformLayer->hasActiveAnimationForTesting());
|
| + ASSERT_FALSE(m_platformLayer->hasTickingAnimationForTesting());
|
|
|
| player.compositorPlayer()->detachElement();
|
| ASSERT_FALSE(player.compositorPlayer()->isElementAttached());
|
|
|