Chromium Code Reviews| 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 a181b09e0d4ae5ad3582507bf8b6505852f7f994..ede087e4b9c6963e9c2ca5884723744e4347f912 100644 |
| --- a/cc/trees/layer_tree_host_unittest_delegated.cc |
| +++ b/cc/trees/layer_tree_host_unittest_delegated.cc |
| @@ -114,7 +114,8 @@ class LayerTreeHostDelegatedTest : public LayerTreeTest { |
| float vertex_opacity[4] = {1.f, 1.f, 1.f, 1.f}; |
| bool flipped = false; |
| - scoped_ptr<TextureDrawQuad> invalid_draw_quad = TextureDrawQuad::Create(); |
| + TextureDrawQuad* invalid_draw_quad = |
| + root_pass->CreateAndAppendDrawQuad<TextureDrawQuad>(); |
| invalid_draw_quad->SetNew(shared_quad_state, |
| rect, |
| opaque_rect, |
| @@ -126,7 +127,6 @@ class LayerTreeHostDelegatedTest : public LayerTreeTest { |
| background_color, |
| vertex_opacity, |
| flipped); |
| - root_pass->quad_list.push_back(invalid_draw_quad.PassAs<DrawQuad>()); |
| frame->render_pass_list.push_back(root_pass.Pass()); |
| return frame.Pass(); |
| @@ -149,7 +149,8 @@ class LayerTreeHostDelegatedTest : public LayerTreeTest { |
| ResourceProvider::ResourceId resource_id) { |
| SharedQuadState* sqs = |
| frame->render_pass_list[0]->CreateAndAppendSharedQuadState(); |
| - scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); |
| + TextureDrawQuad* quad = |
| + frame->render_pass_list[0]->CreateAndAppendDrawQuad<TextureDrawQuad>(); |
| float vertex_opacity[4] = { 1.f, 1.f, 1.f, 1.f }; |
| quad->SetNew(sqs, |
| gfx::Rect(0, 0, 10, 10), |
| @@ -162,7 +163,6 @@ class LayerTreeHostDelegatedTest : public LayerTreeTest { |
| SK_ColorTRANSPARENT, |
| vertex_opacity, |
| false); |
| - frame->render_pass_list[0]->quad_list.push_back(quad.PassAs<DrawQuad>()); |
| } |
| void AddRenderPass(DelegatedFrameData* frame, |
| @@ -183,7 +183,9 @@ class LayerTreeHostDelegatedTest : public LayerTreeTest { |
| SharedQuadState* sqs = |
| frame->render_pass_list[0]->CreateAndAppendSharedQuadState(); |
| - scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); |
| + RenderPassDrawQuad* quad = |
| + frame->render_pass_list[0] |
|
danakj
2014/07/07 22:30:15
Can you put this RenderPass in a temp var for bett
weiliangc
2014/07/08 21:54:38
Done.
|
| + ->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); |
| quad->SetNew(sqs, |
| output_rect, |
| @@ -195,7 +197,6 @@ class LayerTreeHostDelegatedTest : public LayerTreeTest { |
| gfx::Rect(0, 0, 1, 1), // mask_uv_rect |
| filters, |
| background_filters); |
| - frame->render_pass_list[0]->quad_list.push_back(quad.PassAs<DrawQuad>()); |
| } |
| static ResourceProvider::ResourceId AppendResourceId( |