cc: Make RenderPass into a struct-like class.

cc/test/render_pass_test_common.cc

Index: cc/test/render_pass_test_common.cc
diff --git a/cc/test/render_pass_test_common.cc b/cc/test/render_pass_test_common.cc
index 5af6c1eede8ab5aefd9e63b61e78e8acd8b94302..bbb8a346a0cd187af46d5edbdbf76e4dd91ae1db 100644
--- a/cc/test/render_pass_test_common.cc
+++ b/cc/test/render_pass_test_common.cc
@@ -22,57 +22,117 @@ namespace WebKitTests {
 using cc::DrawQuad;
 using WebKit::WebTransformationMatrix;
 
-void TestRenderPass::appendOneOfEveryQuadType(cc::ResourceProvider* resourceProvider)
-{
-    gfx::Rect rect(0, 0, 100, 100);
-    gfx::Rect opaqueRect(10, 10, 80, 80);
-    cc::ResourceProvider::ResourceId textureResource = resourceProvider->createResourceFromExternalTexture(1);
-    scoped_ptr<cc::SharedQuadState> sharedState = cc::SharedQuadState::Create();
-    sharedState->SetAll(WebTransformationMatrix(), rect, rect, 1);
-
-    scoped_ptr<cc::CheckerboardDrawQuad> checkerboardQuad = cc::CheckerboardDrawQuad::Create();
-    checkerboardQuad->SetNew(sharedState.get(), rect, SK_ColorRED);
-    appendQuad(checkerboardQuad.PassAs<DrawQuad>());
-
-    scoped_ptr<cc::DebugBorderDrawQuad> debugBorderQuad = cc::DebugBorderDrawQuad::Create();
-    debugBorderQuad->SetNew(sharedState.get(), rect, SK_ColorRED, 1);
-    appendQuad(debugBorderQuad.PassAs<DrawQuad>());
-
-    scoped_ptr<cc::IOSurfaceDrawQuad> ioSurfaceQuad = cc::IOSurfaceDrawQuad::Create();
-    ioSurfaceQuad->SetNew(sharedState.get(), rect, opaqueRect, gfx::Size(50, 50), 1, cc::IOSurfaceDrawQuad::FLIPPED);
-    appendQuad(ioSurfaceQuad.PassAs<DrawQuad>());
-
-    scoped_ptr<cc::RenderPassDrawQuad> renderPassQuad = cc::RenderPassDrawQuad::Create();
-    renderPassQuad->SetNew(sharedState.get(), rect, cc::RenderPass::Id(1, 1), false, 0, rect, 0, 0, 0, 0);
-    appendQuad(renderPassQuad.PassAs<DrawQuad>());
-
-    scoped_ptr<cc::SolidColorDrawQuad> solidColorQuad = cc::SolidColorDrawQuad::Create();
-    solidColorQuad->SetNew(sharedState.get(), rect, SK_ColorRED);
-    appendQuad(solidColorQuad.PassAs<DrawQuad>());
-
-    scoped_ptr<cc::StreamVideoDrawQuad> streamVideoQuad = cc::StreamVideoDrawQuad::Create();
-    streamVideoQuad->SetNew(sharedState.get(), rect, opaqueRect, 1, WebKit::WebTransformationMatrix());
-    appendQuad(streamVideoQuad.PassAs<DrawQuad>());
-
-    scoped_ptr<cc::TextureDrawQuad> textureQuad = cc::TextureDrawQuad::Create();
-    textureQuad->SetNew(sharedState.get(), rect, opaqueRect, textureResource, false, rect, false);
-    appendQuad(textureQuad.PassAs<DrawQuad>());
-
-    scoped_ptr<cc::TileDrawQuad> tileQuad = cc::TileDrawQuad::Create();
-    tileQuad->SetNew(sharedState.get(), rect, opaqueRect, textureResource, gfx::RectF(0, 0, 100, 100), gfx::Size(100, 100), false, false, false, false, false);
-    appendQuad(tileQuad.PassAs<DrawQuad>());
-
-    cc::VideoLayerImpl::FramePlane planes[3];
-    for (int i = 0; i < 3; ++i) {
-        planes[i].resourceId = resourceProvider->createResourceFromExternalTexture(1);
-        planes[i].size = gfx::Size(100, 100);
-        planes[i].format = GL_LUMINANCE;
-    }
-    scoped_ptr<cc::YUVVideoDrawQuad> yuvQuad = cc::YUVVideoDrawQuad::Create();
-    yuvQuad->SetNew(sharedState.get(), rect, opaqueRect, gfx::Size(100, 100), planes[0], planes[1], planes[2]);
-    appendQuad(yuvQuad.PassAs<DrawQuad>());
-
-    appendSharedQuadState(sharedState.Pass());
+void TestRenderPass::AppendOneOfEveryQuadType(cc::ResourceProvider* resourceProvider) {
+  gfx::Rect rect(0, 0, 100, 100);
+  gfx::Rect opaque_rect(10, 10, 80, 80);
+  cc::ResourceProvider::ResourceId texture_resource =
+      resourceProvider->createResourceFromExternalTexture(1);
+  scoped_ptr<cc::SharedQuadState> shared_state = cc::SharedQuadState::Create();
+  shared_state->SetAll(WebTransformationMatrix(),
+                       rect,
+                       rect,
+                       1);
+
+  scoped_ptr<cc::CheckerboardDrawQuad> checkerboard_quad =
+      cc::CheckerboardDrawQuad::Create();
+  checkerboard_quad->SetNew(shared_state.get(),
+                            rect,
+                            SK_ColorRED);
+  AppendQuad(checkerboard_quad.PassAs<DrawQuad>());
+
+  scoped_ptr<cc::DebugBorderDrawQuad> debug_border_quad =
+      cc::DebugBorderDrawQuad::Create();
+  debug_border_quad->SetNew(shared_state.get(),
+                            rect,
+                            SK_ColorRED,
+                            1);
+  AppendQuad(debug_border_quad.PassAs<DrawQuad>());
+
+  scoped_ptr<cc::IOSurfaceDrawQuad> io_surface_quad =
+      cc::IOSurfaceDrawQuad::Create();
+  io_surface_quad->SetNew(shared_state.get(),
+                          rect,
+                          opaque_rect,
+                          gfx::Size(50, 50),
+                          1,
+                          cc::IOSurfaceDrawQuad::FLIPPED);
+  AppendQuad(io_surface_quad.PassAs<DrawQuad>());
+
+  scoped_ptr<cc::RenderPassDrawQuad> render_pass_quad =
+      cc::RenderPassDrawQuad::Create();
+  render_pass_quad->SetNew(shared_state.get(),
+                           rect,
+                           cc::RenderPass::Id(1, 1),
+                           false,
+                           0,
+                           rect,
+                           0,
+                           0,
+                           0,
+                           0);
+  AppendQuad(render_pass_quad.PassAs<DrawQuad>());
+
+  scoped_ptr<cc::SolidColorDrawQuad> solid_color_quad =
+      cc::SolidColorDrawQuad::Create();
+  solid_color_quad->SetNew(shared_state.get(),
+                           rect,
+                           SK_ColorRED);
+  AppendQuad(solid_color_quad.PassAs<DrawQuad>());
+
+  scoped_ptr<cc::StreamVideoDrawQuad> stream_video_quad =
+      cc::StreamVideoDrawQuad::Create();
+  stream_video_quad->SetNew(shared_state.get(),
+                            rect,
+                            opaque_rect,
+                            1,
+                            WebKit::WebTransformationMatrix());
+  AppendQuad(stream_video_quad.PassAs<DrawQuad>());
+
+  scoped_ptr<cc::TextureDrawQuad> texture_quad =
+      cc::TextureDrawQuad::Create();
+  texture_quad->SetNew(shared_state.get(),
+                       rect,
+                       opaque_rect,
+                       texture_resource,
+                       false,
+                       rect,
+                       false);
+  AppendQuad(texture_quad.PassAs<DrawQuad>());
+
+  scoped_ptr<cc::TileDrawQuad> tile_quad =
+      cc::TileDrawQuad::Create();
+  tile_quad->SetNew(shared_state.get(),
+                    rect,
+                    opaque_rect,
+                    texture_resource,
+                    gfx::RectF(0, 0, 100, 100),
+                    gfx::Size(100, 100),
+                    false,
+                    false,
+                    false,
+                    false,
+                    false);
+  AppendQuad(tile_quad.PassAs<DrawQuad>());
+
+  cc::VideoLayerImpl::FramePlane planes[3];
+  for (int i = 0; i < 3; ++i) {
+    planes[i].resourceId =
+        resourceProvider->createResourceFromExternalTexture(1);
+    planes[i].size = gfx::Size(100, 100);
+    planes[i].format = GL_LUMINANCE;
+  }
+  scoped_ptr<cc::YUVVideoDrawQuad> yuv_quad =
+      cc::YUVVideoDrawQuad::Create();
+  yuv_quad->SetNew(shared_state.get(),
+                   rect,
+                   opaque_rect,
+                   gfx::Size(100, 100),
+                   planes[0],
+                   planes[1],
+                   planes[2]);
+  AppendQuad(yuv_quad.PassAs<DrawQuad>());
+
+  AppendSharedQuadState(shared_state.Pass());
 }
 
 }  // namespace WebKitTests