Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2934)

Unified Diff: cc/trees/layer_tree_host_unittest_animation_timelines.cc

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: just the vector Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: cc/trees/layer_tree_host_unittest_animation_timelines.cc
diff --git a/cc/trees/layer_tree_host_unittest_animation_timelines.cc b/cc/trees/layer_tree_host_unittest_animation_timelines.cc
index 69c42efa9547f2559e2c96da96f0eadf08abce98..30b69ee1fb38692d59440014c940dbfa3239e549 100644
--- a/cc/trees/layer_tree_host_unittest_animation_timelines.cc
+++ b/cc/trees/layer_tree_host_unittest_animation_timelines.cc
@@ -658,7 +658,7 @@ class LayerTreeHostTimelinesTestScrollOffsetAnimationRemoval
timeline_impl->GetPlayerById(player_child_id_);
LayerImpl* scroll_layer_impl =
- host_impl->active_tree()->root_layer()->children()[0];
+ host_impl->active_tree()->root_layer()->children()[0].get();
Animation* animation = player_impl->element_animations()
->layer_animation_controller()
->GetAnimation(Animation::SCROLL_OFFSET);
@@ -681,7 +681,7 @@ class LayerTreeHostTimelinesTestScrollOffsetAnimationRemoval
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());
}
@@ -689,7 +689,7 @@ class LayerTreeHostTimelinesTestScrollOffsetAnimationRemoval
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();
}
@@ -970,7 +970,7 @@ class LayerTreeHostTimelinesTestAnimationFinishesDuringCommit
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;

Powered by Google App Engine
This is Rietveld 408576698