summaryrefslogtreecommitdiffstats
path: root/cc/gl_renderer_unittest.cc
diff options
context:
space:
mode:
authordanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 07:02:15 +0000
committerdanakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-21 07:02:15 +0000
commitf57bbc063aa387dbd7c929cacc8d55a960a28ec4 (patch)
treeefdd404c8ee8be1d32a92d4c1c1dfd8e65ba89a9 /cc/gl_renderer_unittest.cc
parent493227ba58e115567c5eab085250beec83e03038 (diff)
downloadchromium_src-f57bbc063aa387dbd7c929cacc8d55a960a28ec4.zip
chromium_src-f57bbc063aa387dbd7c929cacc8d55a960a28ec4.tar.gz
chromium_src-f57bbc063aa387dbd7c929cacc8d55a960a28ec4.tar.bz2
cc: Make RenderPass into a struct-like class.
This follows the same pattern as DrawQuad and SharedQuadState. The Create() method takes no parameters, allowing the IPC code to create an empty RenderPass. Then we have SetNew() and SetAll() methods to set the the properties of the RenderPass when creating a new one, or when recreating one via IPC, respectively. Covered by existing tests. BUG=152337 TBR=aelias Review URL: https://chromiumcodereview.appspot.com/11413106 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/gl_renderer_unittest.cc')
-rw-r--r--cc/gl_renderer_unittest.cc16
1 files changed, 9 insertions, 7 deletions
diff --git a/cc/gl_renderer_unittest.cc b/cc/gl_renderer_unittest.cc
index 3d3f68a..f948743 100644
--- a/cc/gl_renderer_unittest.cc
+++ b/cc/gl_renderer_unittest.cc
@@ -59,7 +59,8 @@ public:
{
m_rootLayer->createRenderSurface();
RenderPass::Id renderPassId = m_rootLayer->renderSurface()->renderPassId();
- scoped_ptr<RenderPass> rootRenderPass = RenderPass::create(renderPassId, gfx::Rect(), WebTransformationMatrix());
+ scoped_ptr<RenderPass> rootRenderPass = RenderPass::Create();
+ rootRenderPass->SetNew(renderPassId, gfx::Rect(), gfx::Rect(), WebTransformationMatrix());
m_renderPassesInDrawOrder.push_back(rootRenderPass.get());
m_renderPasses.set(renderPassId, rootRenderPass.Pass());
}
@@ -390,7 +391,7 @@ TEST(GLRendererTest2, opaqueBackground)
scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(outputSurface.get()));
FakeRendererGL renderer(&mockClient, resourceProvider.get());
- mockClient.rootRenderPass()->setHasTransparentBackground(false);
+ mockClient.rootRenderPass()->has_transparent_background = false;
EXPECT_TRUE(renderer.initialize());
@@ -413,7 +414,7 @@ TEST(GLRendererTest2, transparentBackground)
scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(outputSurface.get()));
FakeRendererGL renderer(&mockClient, resourceProvider.get());
- mockClient.rootRenderPass()->setHasTransparentBackground(true);
+ mockClient.rootRenderPass()->has_transparent_background = true;
EXPECT_TRUE(renderer.initialize());
@@ -529,8 +530,9 @@ TEST(GLRendererTest2, activeTextureState)
EXPECT_TRUE(renderer.initialize());
cc::RenderPass::Id id(1, 1);
- scoped_ptr<TestRenderPass> pass = TestRenderPass::create(id, gfx::Rect(0, 0, 100, 100), WebTransformationMatrix());
- pass->appendOneOfEveryQuadType(resourceProvider.get());
+ scoped_ptr<TestRenderPass> pass = TestRenderPass::Create();
+ pass->SetNew(id, gfx::Rect(0, 0, 100, 100), gfx::Rect(0, 0, 100, 100), WebTransformationMatrix());
+ pass->AppendOneOfEveryQuadType(resourceProvider.get());
context->setInDraw();
@@ -538,8 +540,8 @@ TEST(GLRendererTest2, activeTextureState)
renderer.beginDrawingFrame(drawingFrame);
EXPECT_EQ(context->activeTexture(), GL_TEXTURE0);
- for (cc::QuadList::backToFrontIterator it = pass->quadList().backToFrontBegin();
- it != pass->quadList().backToFrontEnd(); ++it) {
+ for (cc::QuadList::backToFrontIterator it = pass->quad_list.backToFrontBegin();
+ it != pass->quad_list.backToFrontEnd(); ++it) {
renderer.drawQuad(drawingFrame, *it);
}
EXPECT_EQ(context->activeTexture(), GL_TEXTURE0);