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 62acaf7088a0107ddd1bbaeac496012daebd0304..22299db09b270e0ee647885985a4ec0051b8a980 100644 |
--- a/cc/trees/layer_tree_host_unittest_animation.cc |
+++ b/cc/trees/layer_tree_host_unittest_animation.cc |
@@ -44,7 +44,8 @@ class LayerTreeHostAnimationTest : public LayerTreeTest { |
} |
void AttachPlayersToTimeline() { |
- layer_tree_host()->animation_host()->AddAnimationTimeline(timeline_.get()); |
+ layer_tree_host()->GetLayerTree()->animation_host()->AddAnimationTimeline( |
+ timeline_.get()); |
layer_tree_host()->SetElementIdsForTesting(); |
timeline_->AttachPlayer(player_.get()); |
timeline_->AttachPlayer(player_child_.get()); |
@@ -787,10 +788,12 @@ class LayerTreeHostAnimationTestScrollOffsetAnimationTakeover |
// Add an update after the first commit to trigger the animation takeover |
// path. |
layer_tree_host() |
+ ->GetLayerTree() |
->animation_host() |
->scroll_offset_animations() |
.AddTakeoverUpdate(scroll_layer_->element_id()); |
EXPECT_TRUE(layer_tree_host() |
+ ->GetLayerTree() |
->animation_host() |
->scroll_offset_animations() |
.HasUpdatesForTesting()); |
@@ -848,17 +851,20 @@ class LayerTreeHostAnimationTestScrollOffsetAnimationAdjusted |
// Add an update after the first commit to trigger the animation update |
// path. |
layer_tree_host() |
+ ->GetLayerTree() |
->animation_host() |
->scroll_offset_animations() |
.AddAdjustmentUpdate(scroll_layer_->element_id(), |
gfx::Vector2dF(100.f, 100.f)); |
EXPECT_TRUE(layer_tree_host() |
+ ->GetLayerTree() |
->animation_host() |
->scroll_offset_animations() |
.HasUpdatesForTesting()); |
} else if (layer_tree_host()->source_frame_number() == 2) { |
// Verify that the update queue is cleared after the update is applied. |
EXPECT_FALSE(layer_tree_host() |
+ ->GetLayerTree() |
->animation_host() |
->scroll_offset_animations() |
.HasUpdatesForTesting()); |
@@ -1234,7 +1240,8 @@ class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded |
layer_tree_host()->SetElementIdsForTesting(); |
- layer_tree_host()->animation_host()->AddAnimationTimeline(timeline_.get()); |
+ layer_tree_host()->GetLayerTree()->animation_host()->AddAnimationTimeline( |
+ timeline_.get()); |
timeline_->AttachPlayer(player_.get()); |
player_->AttachElement(layer_->element_id()); |
DCHECK(player_->element_animations()); |
@@ -1251,7 +1258,10 @@ class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded |
player_->element_animations()->has_element_in_active_list()); |
EXPECT_FALSE( |
player_->element_animations()->has_element_in_pending_list()); |
- EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers()); |
+ EXPECT_TRUE(layer_tree_host() |
+ ->GetLayerTree() |
+ ->animation_host() |
+ ->NeedsAnimateLayers()); |
break; |
case 1: |
layer_->RemoveFromParent(); |
@@ -1259,7 +1269,10 @@ class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded |
player_->element_animations()->has_element_in_active_list()); |
EXPECT_FALSE( |
player_->element_animations()->has_element_in_pending_list()); |
- EXPECT_FALSE(layer_tree_host()->animation_host()->NeedsAnimateLayers()); |
+ EXPECT_FALSE(layer_tree_host() |
+ ->GetLayerTree() |
+ ->animation_host() |
+ ->NeedsAnimateLayers()); |
break; |
case 2: |
layer_tree_host()->root_layer()->AddChild(layer_); |
@@ -1267,7 +1280,10 @@ class LayerTreeHostAnimationTestAnimatedLayerRemovedAndAdded |
player_->element_animations()->has_element_in_active_list()); |
EXPECT_FALSE( |
player_->element_animations()->has_element_in_pending_list()); |
- EXPECT_TRUE(layer_tree_host()->animation_host()->NeedsAnimateLayers()); |
+ EXPECT_TRUE(layer_tree_host() |
+ ->GetLayerTree() |
+ ->animation_host() |
+ ->NeedsAnimateLayers()); |
break; |
} |
} |