| 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..e20fbbbe872a718766ece89252213a65c17750ed 100644
|
| --- a/cc/trees/layer_tree_host_unittest_delegated.cc
|
| +++ b/cc/trees/layer_tree_host_unittest_delegated.cc
|
| @@ -767,11 +767,12 @@ class LayerTreeHostDelegatedTestRemapResourcesInQuads
|
| EXPECT_NE(parent_resource_id2, 555u);
|
|
|
| // 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]);
|
| + QuadList::ConstIterator iter =
|
| + delegated_impl->RenderPassesInDrawOrder()[0]->quad_list.begin();
|
| + const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(parent_resource_id1, quad1->resource_id);
|
| - const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(
|
| - delegated_impl->RenderPassesInDrawOrder()[0]->quad_list[1]);
|
| + ++iter;
|
| + const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(parent_resource_id2, quad2->resource_id);
|
|
|
| EndTest();
|
| @@ -1020,8 +1021,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 +1136,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]);
|
| + QuadList::ConstIterator iter = pass->quad_list.begin();
|
| + const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(map.find(999)->second, quad1->resource_id);
|
| - const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[1]);
|
| + ++iter;
|
| + const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(map.find(555)->second, quad2->resource_id);
|
| - const TextureDrawQuad* quad3 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[2]);
|
| + ++iter;
|
| + const TextureDrawQuad* quad3 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(map.find(444)->second, quad3->resource_id);
|
| }
|
|
|
| @@ -1258,11 +1259,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]);
|
| + QuadList::ConstIterator iter = pass->quad_list.begin();
|
| + const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(map.find(999)->second, quad1->resource_id);
|
| - const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[1]);
|
| + ++iter;
|
| + const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(map.find(555)->second, quad2->resource_id);
|
| break;
|
| }
|
| @@ -1280,11 +1281,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]);
|
| + QuadList::ConstIterator iter = pass->quad_list.begin();
|
| + const TextureDrawQuad* quad1 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(map.find(999)->second, quad1->resource_id);
|
| - const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(
|
| - pass->quad_list[1]);
|
| + ++iter;
|
| + const TextureDrawQuad* quad2 = TextureDrawQuad::MaterialCast(&*iter);
|
| EXPECT_EQ(map.find(555)->second, quad2->resource_id);
|
| break;
|
| }
|
| @@ -1298,8 +1299,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;
|
| }
|
|
|