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

Unified Diff: cc/trees/layer_tree_host_unittest_damage.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_damage.cc
diff --git a/cc/trees/layer_tree_host_unittest_damage.cc b/cc/trees/layer_tree_host_unittest_damage.cc
index 6d2b71bee57e97fb692c352ee1a496a80946deeb..6ca11e9c51b4f9f0c000f7b40b2544a5c088de8e 100644
--- a/cc/trees/layer_tree_host_unittest_damage.cc
+++ b/cc/trees/layer_tree_host_unittest_damage.cc
@@ -410,8 +410,8 @@ class LayerTreeHostDamageTestScrollbarDoesDamage
++did_swaps_;
EXPECT_TRUE(result);
LayerImpl* root = host_impl->active_tree()->root_layer();
- LayerImpl* scroll_clip_layer = root->children()[0];
- LayerImpl* scroll_layer = scroll_clip_layer->children()[0];
+ LayerImpl* scroll_clip_layer = root->children()[0].get();
+ LayerImpl* scroll_layer = scroll_clip_layer->children()[0].get();
switch (did_swaps_) {
case 1:
// Test that modifying the position of the content layer (not
@@ -503,8 +503,8 @@ class LayerTreeHostDamageTestScrollbarCommitDoesNoDamage
++did_swaps_;
EXPECT_TRUE(result);
LayerImpl* root = host_impl->active_tree()->root_layer();
- LayerImpl* scroll_clip_layer = root->children()[0];
- LayerImpl* scroll_layer = scroll_clip_layer->children()[0];
+ LayerImpl* scroll_clip_layer = root->children()[0].get();
+ LayerImpl* scroll_layer = scroll_clip_layer->children()[0].get();
switch (did_swaps_) {
case 1:
// Scroll on the thread. This should damage the scrollbar for the

Powered by Google App Engine
This is Rietveld 408576698