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 e5eedbfc67b505937753e0f4146a6695a5892b75..bfc074880bc34621c381147c6749a41e92284935 100644 |
--- a/cc/layers/tiled_layer_impl_unittest.cc |
+++ b/cc/layers/tiled_layer_impl_unittest.cc |
@@ -172,8 +172,10 @@ TEST_F(TiledLayerImplTest, Checkerboarding) { |
EXPECT_EQ(render_pass->quad_list.size(), 4u); |
EXPECT_EQ(0u, data.num_missing_tiles); |
- for (size_t i = 0; i < render_pass->quad_list.size(); ++i) |
- EXPECT_EQ(render_pass->quad_list[i]->material, DrawQuad::TILED_CONTENT); |
+ for (QuadList::Iterator iter = render_pass->quad_list.begin(); |
+ iter != render_pass->quad_list.end(); |
+ ++iter) |
+ EXPECT_EQ(iter->material, DrawQuad::TILED_CONTENT); |
} |
for (int i = 0; i < num_tiles_x; ++i) |
@@ -189,8 +191,10 @@ TEST_F(TiledLayerImplTest, Checkerboarding) { |
layer->AppendQuads(render_pass.get(), occlusion_tracker, &data); |
EXPECT_LT(0u, data.num_missing_tiles); |
EXPECT_EQ(render_pass->quad_list.size(), 4u); |
- for (size_t i = 0; i < render_pass->quad_list.size(); ++i) |
- EXPECT_NE(render_pass->quad_list[i]->material, DrawQuad::TILED_CONTENT); |
+ for (QuadList::Iterator iter = render_pass->quad_list.begin(); |
+ iter != render_pass->quad_list.end(); |
+ ++iter) |
+ EXPECT_NE(iter->material, DrawQuad::TILED_CONTENT); |
} |
} |
@@ -266,9 +270,11 @@ TEST_F(TiledLayerImplTest, TextureInfoForLayerNoBorders) { |
LayerTilingData::NO_BORDER_TEXELS, |
gfx::Rect(layer_size)); |
- for (size_t i = 0; i < render_pass->quad_list.size(); ++i) { |
- const TileDrawQuad* quad = |
- TileDrawQuad::MaterialCast(render_pass->quad_list[i]); |
+ size_t i = 0; |
+ for (QuadList::Iterator iter = render_pass->quad_list.begin(); |
+ iter != render_pass->quad_list.end(); |
+ ++iter) { |
+ const TileDrawQuad* quad = TileDrawQuad::MaterialCast(&*iter); |
EXPECT_NE(0u, quad->resource_id) << LayerTestCommon::quad_string << i; |
EXPECT_EQ(gfx::RectF(gfx::PointF(), tile_size), quad->tex_coord_rect) |
@@ -277,6 +283,7 @@ TEST_F(TiledLayerImplTest, TextureInfoForLayerNoBorders) { |
<< i; |
EXPECT_EQ(gfx::Size(1, 1).ToString(), quad->opaque_rect.size().ToString()) |
<< LayerTestCommon::quad_string << i; |
+ ++i; |
} |
} |