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

Unified Diff: cc/layers/picture_layer_impl_unittest.cc

Issue 502203003: Remove implicit conversions from scoped_refptr to T* in cc/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change to use .get() instead of rewriting local variable Created 6 years, 4 months 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
« no previous file with comments | « cc/layers/layer_unittest.cc ('k') | cc/layers/solid_color_layer_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/picture_layer_impl_unittest.cc
diff --git a/cc/layers/picture_layer_impl_unittest.cc b/cc/layers/picture_layer_impl_unittest.cc
index 4e0172b2744ec2fcaf0e58c2e5dc1f7ff82b5a7b..1aca6388f70275e829e7827ff8583c1149d9daf8 100644
--- a/cc/layers/picture_layer_impl_unittest.cc
+++ b/cc/layers/picture_layer_impl_unittest.cc
@@ -565,9 +565,9 @@ TEST_F(PictureLayerImplTest, ClonePartialInvalidation) {
EXPECT_TRUE(*iter);
EXPECT_FALSE(iter.geometry_rect().IsEmpty());
if (iter.geometry_rect().Intersects(content_invalidation))
- EXPECT_EQ(pending_pile, iter->picture_pile());
+ EXPECT_EQ(pending_pile.get(), iter->picture_pile());
else
- EXPECT_EQ(active_pile, iter->picture_pile());
+ EXPECT_EQ(active_pile.get(), iter->picture_pile());
}
}
}
@@ -634,9 +634,9 @@ TEST_F(PictureLayerImplTest, NoInvalidationBoundsChange) {
iter.geometry_rect().bottom() >= active_content_bounds.height() ||
active_tiles[0]->content_rect().size() !=
pending_tiles[0]->content_rect().size()) {
- EXPECT_EQ(pending_pile, iter->picture_pile());
+ EXPECT_EQ(pending_pile.get(), iter->picture_pile());
} else {
- EXPECT_EQ(active_pile, iter->picture_pile());
+ EXPECT_EQ(active_pile.get(), iter->picture_pile());
}
}
}
@@ -689,9 +689,9 @@ TEST_F(PictureLayerImplTest, AddTilesFromNewRecording) {
iter.full_tile_geometry_rect());
if (in_pending && !in_active)
- EXPECT_EQ(pending_pile, iter->picture_pile());
+ EXPECT_EQ(pending_pile.get(), iter->picture_pile());
else if (in_active)
- EXPECT_EQ(active_pile, iter->picture_pile());
+ EXPECT_EQ(active_pile.get(), iter->picture_pile());
else
EXPECT_FALSE(*iter);
}
« no previous file with comments | « cc/layers/layer_unittest.cc ('k') | cc/layers/solid_color_layer_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698