| Index: cc/software_renderer_unittest.cc
|
| diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
|
| index 121ba769b9e15d8271e3e1bd896f55619c730c82..cb4e12ca75f995d8aa32f7c7fe0ec94a2d6de248 100644
|
| --- a/cc/software_renderer_unittest.cc
|
| +++ b/cc/software_renderer_unittest.cc
|
| @@ -20,6 +20,8 @@
|
| using namespace WebKit;
|
| using namespace WebKitTests;
|
|
|
| +using gfx::Transform;
|
| +
|
| namespace cc {
|
| namespace {
|
|
|
| @@ -67,10 +69,10 @@ TEST_F(SoftwareRendererTest, solidColorQuad)
|
| initializeRenderer();
|
|
|
| scoped_ptr<SharedQuadState> sharedQuadState = SharedQuadState::Create();
|
| - sharedQuadState->SetAll(WebTransformationMatrix(), outerRect, outerRect, outerRect, false, 1.0);
|
| + sharedQuadState->SetAll(Transform(), outerRect, outerRect, outerRect, false, 1.0);
|
| RenderPass::Id rootRenderPassId = RenderPass::Id(1, 1);
|
| scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::Create();
|
| - rootRenderPass->SetNew(rootRenderPassId, outerRect, gfx::Rect(), WebTransformationMatrix());
|
| + rootRenderPass->SetNew(rootRenderPassId, outerRect, gfx::Rect(), Transform());
|
| scoped_ptr<SolidColorDrawQuad> outerQuad = SolidColorDrawQuad::Create();
|
| outerQuad->SetNew(sharedQuadState.get(), outerRect, SK_ColorYELLOW);
|
| scoped_ptr<SolidColorDrawQuad> innerQuad = SolidColorDrawQuad::Create();
|
| @@ -128,10 +130,10 @@ TEST_F(SoftwareRendererTest, tileQuad)
|
| gfx::Rect rect = gfx::Rect(gfx::Point(), deviceViewportSize());
|
|
|
| scoped_ptr<SharedQuadState> sharedQuadState = SharedQuadState::Create();
|
| - sharedQuadState->SetAll(WebTransformationMatrix(), outerRect, outerRect, outerRect, false, 1.0);
|
| + sharedQuadState->SetAll(Transform(), outerRect, outerRect, outerRect, false, 1.0);
|
| RenderPass::Id rootRenderPassId = RenderPass::Id(1, 1);
|
| scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::Create();
|
| - rootRenderPass->SetNew(rootRenderPassId, gfx::Rect(gfx::Point(), deviceViewportSize()), gfx::Rect(), WebTransformationMatrix());
|
| + rootRenderPass->SetNew(rootRenderPassId, gfx::Rect(gfx::Point(), deviceViewportSize()), gfx::Rect(), Transform());
|
| 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();
|
|
|