diff options
| author | weiliangc@chromium.org <weiliangc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 00:00:02 +0000 |
|---|---|---|
| committer | weiliangc@chromium.org <weiliangc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-10 00:00:02 +0000 |
| commit | 3b85fd90f30a8abef2a9c2a7a93cee208c2801a9 (patch) | |
| tree | 0d2cd97d240358264e89d86599b14e2ea0308224 /cc/trees | |
| parent | e7b662b6dc37a21aa211b0fa7c0bb0dce54b2908 (diff) | |
| download | chromium_src-3b85fd90f30a8abef2a9c2a7a93cee208c2801a9.zip chromium_src-3b85fd90f30a8abef2a9c2a7a93cee208c2801a9.tar.gz chromium_src-3b85fd90f30a8abef2a9c2a7a93cee208c2801a9.tar.bz2 | |
Use RenderPass to create DrawQuad in unittests
Instead of calling DQ::Create() function and then push it into
RenderPass in unittest, use RenderPass's function call to create and
append a DQ while only pass out a raw pointer instead of ownership.
Follow CL 369623002.
BUG=344962
TEST=cc_unittests, content_unittests
Review URL: https://codereview.chromium.org/368403003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282179 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/trees')
| -rw-r--r-- | cc/trees/layer_tree_host_unittest_delegated.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc index a181b09..028f4cf 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(); @@ -147,9 +147,10 @@ class LayerTreeHostDelegatedTest : public LayerTreeTest { void AddTextureQuad(DelegatedFrameData* frame, ResourceProvider::ResourceId resource_id) { - SharedQuadState* sqs = - frame->render_pass_list[0]->CreateAndAppendSharedQuadState(); - scoped_ptr<TextureDrawQuad> quad = TextureDrawQuad::Create(); + RenderPass* render_pass = frame->render_pass_list[0]; + SharedQuadState* sqs = render_pass->CreateAndAppendSharedQuadState(); + TextureDrawQuad* quad = + render_pass->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, @@ -181,9 +181,10 @@ class LayerTreeHostDelegatedTest : public LayerTreeTest { gfx::Transform()); frame->render_pass_list.push_back(pass.Pass()); - SharedQuadState* sqs = - frame->render_pass_list[0]->CreateAndAppendSharedQuadState(); - scoped_ptr<RenderPassDrawQuad> quad = RenderPassDrawQuad::Create(); + RenderPass* render_pass = frame->render_pass_list[0]; + SharedQuadState* sqs = render_pass->CreateAndAppendSharedQuadState(); + RenderPassDrawQuad* quad = + render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>(); quad->SetNew(sqs, output_rect, @@ -195,7 +196,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( |