| Index: ui/compositor/layer_animator_unittest.cc
|
| diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc
|
| index 1d7f07482e0af2bdc347b1e14e3b8adbea97ef3b..51f883b4fd9121f24957b18cbb672c8f36da3476 100644
|
| --- a/ui/compositor/layer_animator_unittest.cc
|
| +++ b/ui/compositor/layer_animator_unittest.cc
|
| @@ -2632,7 +2632,7 @@ TEST(LayerAnimatorTest, LayerMovedBetweenCompositorsDuringAnimation) {
|
| Layer layer;
|
| root_1.Add(&layer);
|
| LayerAnimator* animator = layer.GetAnimator();
|
| - EXPECT_FALSE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting());
|
| + EXPECT_FALSE(layer.cc_layer_for_testing()->HasTickingAnimationForTesting());
|
|
|
| double target_opacity = 1.0;
|
| base::TimeDelta time_delta = base::TimeDelta::FromSeconds(1);
|
| @@ -2641,12 +2641,12 @@ TEST(LayerAnimatorTest, LayerMovedBetweenCompositorsDuringAnimation) {
|
| LayerAnimationElement::CreateOpacityElement(target_opacity, time_delta)));
|
| EXPECT_TRUE(compositor_1->layer_animator_collection()->HasActiveAnimators());
|
| EXPECT_FALSE(compositor_2->layer_animator_collection()->HasActiveAnimators());
|
| - EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting());
|
| + EXPECT_TRUE(layer.cc_layer_for_testing()->HasTickingAnimationForTesting());
|
|
|
| root_2.Add(&layer);
|
| EXPECT_FALSE(compositor_1->layer_animator_collection()->HasActiveAnimators());
|
| EXPECT_TRUE(compositor_2->layer_animator_collection()->HasActiveAnimators());
|
| - EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting());
|
| + EXPECT_TRUE(layer.cc_layer_for_testing()->HasTickingAnimationForTesting());
|
|
|
| host_2.reset();
|
| host_1.reset();
|
| @@ -2676,13 +2676,13 @@ TEST(LayerAnimatorTest, ThreadedAnimationSurvivesIfLayerRemovedAdded) {
|
|
|
| animator->ScheduleAnimation(new LayerAnimationSequence(
|
| LayerAnimationElement::CreateOpacityElement(target_opacity, time_delta)));
|
| - EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting());
|
| + EXPECT_TRUE(layer.cc_layer_for_testing()->HasTickingAnimationForTesting());
|
|
|
| root.Remove(&layer);
|
| - EXPECT_FALSE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting());
|
| + EXPECT_FALSE(layer.cc_layer_for_testing()->HasTickingAnimationForTesting());
|
|
|
| root.Add(&layer);
|
| - EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting());
|
| + EXPECT_TRUE(layer.cc_layer_for_testing()->HasTickingAnimationForTesting());
|
|
|
| host.reset();
|
| TerminateContextFactoryForTests();
|
|
|