| 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 30e6f351f92099ea389605feedcbb14697f38e0d..4ae38fea33ddbc8177b2af4a0d2c576adf342c05 100644
|
| --- a/cc/trees/layer_tree_host_unittest_animation.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_animation.cc
|
| @@ -741,7 +741,7 @@ class LayerTreeHostAnimationTestScrollOffsetAnimationRemoval
|
| }
|
|
|
| LayerImpl* scroll_layer_impl =
|
| - host_impl->active_tree()->root_layer()->children()[0];
|
| + host_impl->active_tree()->root_layer()->children()[0].get();
|
| Animation* animation =
|
| scroll_layer_impl->layer_animation_controller()->GetAnimation(
|
| Animation::SCROLL_OFFSET);
|
| @@ -764,7 +764,7 @@ class LayerTreeHostAnimationTestScrollOffsetAnimationRemoval
|
| if (host_impl->pending_tree()->source_frame_number() != 1)
|
| return;
|
| LayerImpl* scroll_layer_impl =
|
| - host_impl->pending_tree()->root_layer()->children()[0];
|
| + host_impl->pending_tree()->root_layer()->children()[0].get();
|
| EXPECT_EQ(final_postion_, scroll_layer_impl->CurrentScrollOffset());
|
| }
|
|
|
| @@ -772,7 +772,7 @@ class LayerTreeHostAnimationTestScrollOffsetAnimationRemoval
|
| if (host_impl->active_tree()->source_frame_number() != 1)
|
| return;
|
| LayerImpl* scroll_layer_impl =
|
| - host_impl->active_tree()->root_layer()->children()[0];
|
| + host_impl->active_tree()->root_layer()->children()[0].get();
|
| EXPECT_EQ(final_postion_, scroll_layer_impl->CurrentScrollOffset());
|
| EndTest();
|
| }
|
| @@ -910,7 +910,7 @@ class LayerTreeHostAnimationTestPendingTreeAnimatesFirstCommit
|
| return;
|
|
|
| LayerImpl* root = host_impl->sync_tree()->root_layer();
|
| - LayerImpl* child = root->children()[0];
|
| + LayerImpl* child = root->children()[0].get();
|
| LayerAnimationController* controller_impl =
|
| child->layer_animation_controller();
|
| Animation* animation = controller_impl->GetAnimation(Animation::TRANSFORM);
|
| @@ -1088,7 +1088,7 @@ class LayerTreeHostAnimationTestRemoveAnimation
|
|
|
| void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
|
| LayerImpl* root = host_impl->active_tree()->root_layer();
|
| - LayerImpl* child = root->children()[0];
|
| + LayerImpl* child = root->children()[0].get();
|
| switch (host_impl->active_tree()->source_frame_number()) {
|
| case 0:
|
| // No animation yet.
|
| @@ -1149,7 +1149,7 @@ class LayerTreeHostAnimationTestIsAnimating
|
|
|
| void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
|
| LayerImpl* root = host_impl->sync_tree()->root_layer();
|
| - LayerImpl* child = root->children()[0];
|
| + LayerImpl* child = root->children()[0].get();
|
| switch (host_impl->sync_tree()->source_frame_number()) {
|
| case 0:
|
| // No animation yet.
|
| @@ -1170,7 +1170,7 @@ class LayerTreeHostAnimationTestIsAnimating
|
|
|
| void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
|
| LayerImpl* root = host_impl->active_tree()->root_layer();
|
| - LayerImpl* child = root->children()[0];
|
| + LayerImpl* child = root->children()[0].get();
|
| switch (host_impl->active_tree()->source_frame_number()) {
|
| case 0:
|
| // No animation yet.
|
| @@ -1238,7 +1238,7 @@ class LayerTreeHostAnimationTestAnimationFinishesDuringCommit
|
| gfx::Transform expected_transform;
|
| expected_transform.Translate(5.f, 5.f);
|
| LayerImpl* layer_impl =
|
| - host_impl->sync_tree()->root_layer()->children()[0];
|
| + host_impl->sync_tree()->root_layer()->children()[0].get();
|
| EXPECT_EQ(expected_transform, layer_impl->draw_transform());
|
| EndTest();
|
| break;
|
|
|