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

Unified Diff: cc/layers/tiled_layer_impl_unittest.cc

Issue 683113005: Update from chromium https://crrev.com/302282 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 2 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/picture_layer_impl_unittest.cc ('k') | cc/output/delegating_renderer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/tiled_layer_impl_unittest.cc
diff --git a/cc/layers/tiled_layer_impl_unittest.cc b/cc/layers/tiled_layer_impl_unittest.cc
index 1becc6e5c7d7077e09ab5cce992e43e69d318478..689416acf3a715deb459188370bf33cd72a9bb1d 100644
--- a/cc/layers/tiled_layer_impl_unittest.cc
+++ b/cc/layers/tiled_layer_impl_unittest.cc
@@ -163,7 +163,7 @@ TEST_F(TiledLayerImplTest, Checkerboarding) {
EXPECT_EQ(0u, data.num_missing_tiles);
for (const auto& quad : render_pass->quad_list)
- EXPECT_EQ(quad.material, DrawQuad::TILED_CONTENT);
+ EXPECT_EQ(quad->material, DrawQuad::TILED_CONTENT);
}
for (int i = 0; i < num_tiles_x; ++i)
@@ -179,7 +179,7 @@ TEST_F(TiledLayerImplTest, Checkerboarding) {
EXPECT_LT(0u, data.num_missing_tiles);
EXPECT_EQ(render_pass->quad_list.size(), 4u);
for (const auto& quad : render_pass->quad_list)
- EXPECT_NE(quad.material, DrawQuad::TILED_CONTENT);
+ EXPECT_NE(quad->material, DrawQuad::TILED_CONTENT);
}
}
@@ -258,7 +258,7 @@ TEST_F(TiledLayerImplTest, TextureInfoForLayerNoBorders) {
for (auto iter = render_pass->quad_list.cbegin();
iter != render_pass->quad_list.cend();
++iter) {
- const TileDrawQuad* quad = TileDrawQuad::MaterialCast(&*iter);
+ const TileDrawQuad* quad = TileDrawQuad::MaterialCast(*iter);
EXPECT_NE(0u, quad->resource_id) << LayerTestCommon::quad_string
<< iter.index();
« no previous file with comments | « cc/layers/picture_layer_impl_unittest.cc ('k') | cc/output/delegating_renderer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698