| Index: cc/trees/layer_tree_host_unittest_delegated.cc
|
| diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| index eaf78d49f997160f1b639c8602cb8934eca33404..247d94e8647b10f460e36ba9116f02befe47abbb 100644
|
| --- a/cc/trees/layer_tree_host_unittest_delegated.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| @@ -768,10 +768,10 @@ class LayerTreeHostDelegatedTestRemapResourcesInQuads
|
|
|
| // The resources in the quads should be remapped to the parent's namespace.
|
| const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(
|
| - delegated_impl->RenderPassesInDrawOrder()[0]->quad_list[0]);
|
| + delegated_impl->RenderPassesInDrawOrder()[0]->quad_list.ElementAt(0));
|
| EXPECT_EQ(parent_resource_id1, quad1->resource_id);
|
| const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(
|
| - delegated_impl->RenderPassesInDrawOrder()[0]->quad_list[1]);
|
| + delegated_impl->RenderPassesInDrawOrder()[0]->quad_list.ElementAt(1));
|
| EXPECT_EQ(parent_resource_id2, quad2->resource_id);
|
|
|
| EndTest();
|
| @@ -1020,8 +1020,8 @@ class LayerTreeHostDelegatedTestFrameBeforeAck
|
|
|
| const RenderPass* pass = delegated_impl->RenderPassesInDrawOrder()[0];
|
| EXPECT_EQ(1u, pass->quad_list.size());
|
| - const TextureDrawQuad* quad = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[0]);
|
| + const TextureDrawQuad* quad =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.front());
|
| EXPECT_EQ(map.find(999)->second, quad->resource_id);
|
|
|
| EndTest();
|
| @@ -1135,14 +1135,14 @@ class LayerTreeHostDelegatedTestFrameBeforeTakeResources
|
|
|
| const RenderPass* pass = delegated_impl->RenderPassesInDrawOrder()[0];
|
| EXPECT_EQ(3u, pass->quad_list.size());
|
| - const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[0]);
|
| + const TextureDrawQuad* quad1 =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.ElementAt(0));
|
| EXPECT_EQ(map.find(999)->second, quad1->resource_id);
|
| - const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[1]);
|
| + const TextureDrawQuad* quad2 =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.ElementAt(1));
|
| EXPECT_EQ(map.find(555)->second, quad2->resource_id);
|
| - const TextureDrawQuad* quad3 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[2]);
|
| + const TextureDrawQuad* quad3 =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.ElementAt(2));
|
| EXPECT_EQ(map.find(444)->second, quad3->resource_id);
|
| }
|
|
|
| @@ -1258,11 +1258,11 @@ class LayerTreeHostDelegatedTestBadFrame
|
|
|
| const RenderPass* pass = delegated_impl->RenderPassesInDrawOrder()[0];
|
| EXPECT_EQ(2u, pass->quad_list.size());
|
| - const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[0]);
|
| + const TextureDrawQuad* quad1 =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.ElementAt(0));
|
| EXPECT_EQ(map.find(999)->second, quad1->resource_id);
|
| - const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[1]);
|
| + const TextureDrawQuad* quad2 =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.ElementAt(1));
|
| EXPECT_EQ(map.find(555)->second, quad2->resource_id);
|
| break;
|
| }
|
| @@ -1280,11 +1280,11 @@ class LayerTreeHostDelegatedTestBadFrame
|
| // 555 in it.
|
| const RenderPass* pass = delegated_impl->RenderPassesInDrawOrder()[0];
|
| EXPECT_EQ(2u, pass->quad_list.size());
|
| - const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[0]);
|
| + const TextureDrawQuad* quad1 =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.ElementAt(0));
|
| EXPECT_EQ(map.find(999)->second, quad1->resource_id);
|
| - const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[1]);
|
| + const TextureDrawQuad* quad2 =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.ElementAt(1));
|
| EXPECT_EQ(map.find(555)->second, quad2->resource_id);
|
| break;
|
| }
|
| @@ -1298,8 +1298,8 @@ class LayerTreeHostDelegatedTestBadFrame
|
|
|
| const RenderPass* pass = delegated_impl->RenderPassesInDrawOrder()[0];
|
| EXPECT_EQ(1u, pass->quad_list.size());
|
| - const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[0]);
|
| + const TextureDrawQuad* quad1 =
|
| + TextureDrawQuad::MaterialCast(pass->quad_list.front());
|
| EXPECT_EQ(map.find(999)->second, quad1->resource_id);
|
| break;
|
| }
|
|
|