diff options
| author | loyso <loyso@chromium.org> | 2016-03-13 22:07:45 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-14 05:08:44 +0000 |
| commit | db73537f8ed057da02312224a39c92a3f29bf4e4 (patch) | |
| tree | 508f45a39619418a66f49603b83d5e95ff447796 /ui/compositor | |
| parent | b28f153c67525946045e80ea4de9fec491d101ed (diff) | |
| download | chromium_src-db73537f8ed057da02312224a39c92a3f29bf4e4.zip chromium_src-db73537f8ed057da02312224a39c92a3f29bf4e4.tar.gz chromium_src-db73537f8ed057da02312224a39c92a3f29bf4e4.tar.bz2 | |
CC Animation: Rename HasAnimation to HasAnimationForTesting.
Also, erase Layer::IsActive method (it is meaningless and not used anywhere)
BUG=575041
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1797703002
Cr-Commit-Position: refs/heads/master@{#380926}
Diffstat (limited to 'ui/compositor')
| -rw-r--r-- | ui/compositor/layer_animator_unittest.cc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/ui/compositor/layer_animator_unittest.cc b/ui/compositor/layer_animator_unittest.cc index 9c1c5f1..b4afb64 100644 --- a/ui/compositor/layer_animator_unittest.cc +++ b/ui/compositor/layer_animator_unittest.cc @@ -2526,18 +2526,21 @@ TEST(LayerAnimatorTest, LayerMovedBetweenCompositorsDuringAnimation) { Layer layer; root_1.Add(&layer); LayerAnimator* animator = layer.GetAnimator(); + EXPECT_FALSE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting()); + double target_opacity = 1.0; base::TimeDelta time_delta = base::TimeDelta::FromSeconds(1); + animator->ScheduleAnimation(new LayerAnimationSequence( 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()->HasActiveAnimation()); + EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting()); 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()->HasActiveAnimation()); + EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting()); host_2.reset(); host_1.reset(); @@ -2564,13 +2567,16 @@ TEST(LayerAnimatorTest, ThreadedAnimationSurvivesIfLayerRemovedAdded) { LayerAnimator* animator = layer.GetAnimator(); double target_opacity = 1.0; base::TimeDelta time_delta = base::TimeDelta::FromSeconds(1); + 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()->HasActiveAnimation()); root.Remove(&layer); + EXPECT_FALSE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting()); + root.Add(&layer); - EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimation()); + EXPECT_TRUE(layer.cc_layer_for_testing()->HasActiveAnimationForTesting()); host.reset(); TerminateContextFactoryForTests(); |