cc/software_renderer_unittest.cc - Issue 11413106: cc: Make RenderPass into a struct-like class.

Unified Diff: cc/software_renderer_unittest.cc

Issue 11413106: cc: Make RenderPass into a struct-like class. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/software_renderer_unittest.cc

diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc

index 349d8b976a01ac1e5aeeb8cb6752e4a70373db3a..743649e8b9a7dc1f139bb48b960143e01a17c7c9 100644

--- a/cc/software_renderer_unittest.cc

+++ b/cc/software_renderer_unittest.cc

@@ -69,13 +69,14 @@ TEST_F(SoftwareRendererTest, solidColorQuad)

scoped_ptr<SharedQuadState> sharedQuadState = SharedQuadState::Create();

sharedQuadState->SetAll(WebTransformationMatrix(), outerRect, outerRect, 1.0);

RenderPass::Id rootRenderPassId = RenderPass::Id(1, 1);

- scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::create(rootRenderPassId, outerRect, WebTransformationMatrix());

+ scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::Create();

+ rootRenderPass->SetNew(rootRenderPassId, outerRect, gfx::Rect(), WebTransformationMatrix());

scoped_ptr<SolidColorDrawQuad> outerQuad = SolidColorDrawQuad::Create();

outerQuad->SetNew(sharedQuadState.get(), outerRect, SK_ColorYELLOW);

scoped_ptr<SolidColorDrawQuad> innerQuad = SolidColorDrawQuad::Create();

innerQuad->SetNew(sharedQuadState.get(), innerRect, SK_ColorCYAN);

- rootRenderPass->appendQuad(innerQuad.PassAs<DrawQuad>());

- rootRenderPass->appendQuad(outerQuad.PassAs<DrawQuad>());

+ rootRenderPass->AppendQuad(innerQuad.PassAs<DrawQuad>());

+ rootRenderPass->AppendQuad(outerQuad.PassAs<DrawQuad>());

RenderPassList list;

RenderPassIdHashMap hashmap;

@@ -129,13 +130,14 @@ TEST_F(SoftwareRendererTest, tileQuad)

scoped_ptr<SharedQuadState> sharedQuadState = SharedQuadState::Create();

sharedQuadState->SetAll(WebTransformationMatrix(), outerRect, outerRect, 1.0);

RenderPass::Id rootRenderPassId = RenderPass::Id(1, 1);

- scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::create(rootRenderPassId, gfx::Rect(gfx::Point(), deviceViewportSize()), WebTransformationMatrix());

+ scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::Create();

+ rootRenderPass->SetNew(rootRenderPassId, gfx::Rect(gfx::Point(), deviceViewportSize()), gfx::Rect(), WebTransformationMatrix());

scoped_ptr<TileDrawQuad> outerQuad = TileDrawQuad::Create();

outerQuad->SetNew(sharedQuadState.get(), outerRect, outerRect, resourceYellow, gfx::RectF(gfx::PointF(), outerSize), outerSize, false, false, false, false, false);

scoped_ptr<TileDrawQuad> innerQuad = TileDrawQuad::Create();

innerQuad->SetNew(sharedQuadState.get(), innerRect, innerRect, resourceCyan, gfx::RectF(gfx::PointF(), innerSize), innerSize, false, false, false, false, false);