Use RenderPass to create DrawQuad in unittests

cc/output/software_renderer_unittest.cc

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/output/software_renderer.h"
 
 #include "base/run_loop.h"
 #include "cc/output/compositor_frame_metadata.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
@@ skipping 96 matching lines @@
   SharedQuadState* shared_quad_state =
       root_render_pass->CreateAndAppendSharedQuadState();
   shared_quad_state->SetAll(gfx::Transform(),
                             outer_size,
                             outer_rect,
                             outer_rect,
                             false,
                             1.0,
                             SkXfermode::kSrcOver_Mode,
                             0);
-  scoped_ptr<SolidColorDrawQuad> outer_quad = SolidColorDrawQuad::Create();
-  outer_quad->SetNew(
-      shared_quad_state, outer_rect, outer_rect, SK_ColorYELLOW, false);
-  scoped_ptr<SolidColorDrawQuad> inner_quad = SolidColorDrawQuad::Create();
+  SolidColorDrawQuad* inner_quad =
+      root_render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
   inner_quad->SetNew(
       shared_quad_state, inner_rect, inner_rect, SK_ColorCYAN, false);
   inner_quad->visible_rect = visible_rect;
-  root_render_pass->AppendQuad(inner_quad.PassAs<DrawQuad>());
-  root_render_pass->AppendQuad(outer_quad.PassAs<DrawQuad>());
+  SolidColorDrawQuad* outer_quad =
+      root_render_pass->CreateAndAppendDrawQuad<SolidColorDrawQuad>();
+  outer_quad->SetNew(
+      shared_quad_state, outer_rect, outer_rect, SK_ColorYELLOW, false);
 
   RenderPassList list;
   list.push_back(root_render_pass.PassAs<RenderPass>());
 
   float device_scale_factor = 1.f;
   gfx::Rect device_viewport_rect(outer_size);
   scoped_ptr<SkBitmap> output =
       DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);
   EXPECT_EQ(outer_rect.width(), output->info().fWidth);
   EXPECT_EQ(outer_rect.width(), output->info().fHeight);
@@ skipping 54 matching lines @@
   SharedQuadState* shared_quad_state =
       root_render_pass->CreateAndAppendSharedQuadState();
   shared_quad_state->SetAll(gfx::Transform(),
                             outer_size,
                             outer_rect,
                             outer_rect,
                             false,
                             1.0,
                             SkXfermode::kSrcOver_Mode,
                             0);
-  scoped_ptr<TileDrawQuad> outer_quad = TileDrawQuad::Create();
-  outer_quad->SetNew(shared_quad_state,
-                     outer_rect,
-                     outer_rect,
-                     outer_rect,
-                     resource_yellow,
-                     gfx::RectF(outer_size),
-                     outer_size,
-                     false);
-  scoped_ptr<TileDrawQuad> inner_quad = TileDrawQuad::Create();
+  TileDrawQuad* inner_quad =
+      root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
   inner_quad->SetNew(shared_quad_state,
                      inner_rect,
                      inner_rect,
                      inner_rect,
                      resource_cyan,
                      gfx::RectF(inner_size),
                      inner_size,
                      false);
-  root_render_pass->AppendQuad(inner_quad.PassAs<DrawQuad>());
-  root_render_pass->AppendQuad(outer_quad.PassAs<DrawQuad>());
+  TileDrawQuad* outer_quad =
+      root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
+  outer_quad->SetNew(shared_quad_state,
+                     outer_rect,
+                     outer_rect,
+                     outer_rect,
+                     resource_yellow,
+                     gfx::RectF(outer_size),
+                     outer_size,
+                     false);
 
   RenderPassList list;
   list.push_back(root_render_pass.PassAs<RenderPass>());
 
   float device_scale_factor = 1.f;
   gfx::Rect device_viewport_rect(outer_size);
   scoped_ptr<SkBitmap> output =
       DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);
   EXPECT_EQ(outer_rect.width(), output->info().fWidth);
   EXPECT_EQ(outer_rect.width(), output->info().fHeight);
@@ skipping 42 matching lines @@
   SharedQuadState* shared_quad_state =
       root_render_pass->CreateAndAppendSharedQuadState();
   shared_quad_state->SetAll(gfx::Transform(),
                             tile_size,
                             tile_rect,
                             tile_rect,
                             false,
                             1.0,
                             SkXfermode::kSrcOver_Mode,
                             0);
-  scoped_ptr<TileDrawQuad> quad = TileDrawQuad::Create();
+  TileDrawQuad* quad =
+      root_render_pass->CreateAndAppendDrawQuad<TileDrawQuad>();
   quad->SetNew(shared_quad_state,
                tile_rect,
                tile_rect,
                tile_rect,
                resource_cyan,
                gfx::RectF(tile_size),
                tile_size,
                false);
   quad->visible_rect = visible_rect;
-  root_render_pass->AppendQuad(quad.PassAs<DrawQuad>());
 
   RenderPassList list;
   list.push_back(root_render_pass.PassAs<RenderPass>());
 
   float device_scale_factor = 1.f;
   gfx::Rect device_viewport_rect(tile_size);
   scoped_ptr<SkBitmap> output =
       DrawAndCopyOutput(&list, device_scale_factor, device_viewport_rect);
   EXPECT_EQ(tile_rect.width(), output->info().fWidth);
   EXPECT_EQ(tile_rect.width(), output->info().fHeight);
@@ skipping 122 matching lines @@
   EXPECT_EQ(
       SK_ColorMAGENTA,
       output->getColor(interior_visible_rect.x(), interior_visible_rect.y()));
   EXPECT_EQ(SK_ColorMAGENTA,
             output->getColor(interior_visible_rect.right() - 1,
                              interior_visible_rect.bottom() - 1));
 }
 
 }  // namespace
 }  // namespace cc