Index: cc/software_renderer_unittest.cc |
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc |
index 743649e8b9a7dc1f139bb48b960143e01a17c7c9..d0c993ffc49080b55f274053a1dd6debc0db39f0 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, 1.0); |
+ sharedQuadState->SetAll(Transform(), outerRect, outerRect, 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, 1.0); |
+ sharedQuadState->SetAll(Transform(), outerRect, outerRect, 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(); |