| Index: cc/trees/layer_tree_host_unittest_animation.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_animation.cc b/cc/trees/layer_tree_host_unittest_animation.cc
|
| index 08dcc00216bc88bf4e2d40eb0dc135b7d4b97b4a..be043d17c332aa2f8749d21b2def5d52c936001c 100644
|
| --- a/cc/trees/layer_tree_host_unittest_animation.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_animation.cc
|
| @@ -1068,25 +1068,25 @@ class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded
|
| switch (layer_tree_host()->source_frame_number()) {
|
| case 0:
|
| EXPECT_TRUE(
|
| - player_->element_animations()->needs_active_value_observations());
|
| + player_->element_animations()->has_element_in_active_list());
|
| EXPECT_FALSE(
|
| - player_->element_animations()->needs_pending_value_observations());
|
| + player_->element_animations()->has_element_in_pending_list());
|
| EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
|
| break;
|
| case 1:
|
| layer_->RemoveFromParent();
|
| EXPECT_FALSE(
|
| - player_->element_animations()->needs_active_value_observations());
|
| + player_->element_animations()->has_element_in_active_list());
|
| EXPECT_FALSE(
|
| - player_->element_animations()->needs_pending_value_observations());
|
| + player_->element_animations()->has_element_in_pending_list());
|
| EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
|
| break;
|
| case 2:
|
| layer_tree_host()->root_layer()->AddChild(layer_);
|
| EXPECT_TRUE(
|
| - player_->element_animations()->needs_active_value_observations());
|
| + player_->element_animations()->has_element_in_active_list());
|
| EXPECT_FALSE(
|
| - player_->element_animations()->needs_pending_value_observations());
|
| + player_->element_animations()->has_element_in_pending_list());
|
| EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers());
|
| break;
|
| }
|
| @@ -1100,18 +1100,18 @@ class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded
|
|
|
| switch (host_impl->active_tree()->source_frame_number()) {
|
| case 0:
|
| - EXPECT_TRUE(player_impl->element_animations()
|
| - ->needs_active_value_observations());
|
| + EXPECT_TRUE(
|
| + player_impl->element_animations()->has_element_in_active_list());
|
| EXPECT_TRUE(host_impl->animation_host()->NeedsAnimateLayers());
|
| break;
|
| case 1:
|
| - EXPECT_FALSE(player_impl->element_animations()
|
| - ->needs_active_value_observations());
|
| + EXPECT_FALSE(
|
| + player_impl->element_animations()->has_element_in_active_list());
|
| EXPECT_TRUE(host_impl->animation_host()->NeedsAnimateLayers());
|
| break;
|
| case 2:
|
| - EXPECT_TRUE(player_impl->element_animations()
|
| - ->needs_active_value_observations());
|
| + EXPECT_TRUE(
|
| + player_impl->element_animations()->has_element_in_active_list());
|
| EXPECT_TRUE(host_impl->animation_host()->NeedsAnimateLayers());
|
| EndTest();
|
| break;
|
|
|