Index: cc/software_renderer_unittest.cc |
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc |
index 5608ee90707e8ccbdb6b6b801b1c5121b59cd1f8..09a1f4212d6e33083aeab1171fb0696ac5c77c36 100644 |
--- a/cc/software_renderer_unittest.cc |
+++ b/cc/software_renderer_unittest.cc |
@@ -71,7 +71,7 @@ TEST_F(SoftwareRendererTest, solidColorQuad) |
gfx::Size outerSize(100, 100); |
int outerPixels = outerSize.width() * outerSize.height(); |
gfx::Size innerSize(98, 98); |
- gfx::Rect outerRect(gfx::Point(), outerSize); |
+ gfx::Rect outerRect(outerSize); |
gfx::Rect innerRect(gfx::Point(1, 1), innerSize); |
setViewportSize(outerSize); |
@@ -81,7 +81,7 @@ TEST_F(SoftwareRendererTest, solidColorQuad) |
sharedQuadState->SetAll(gfx::Transform(), outerRect, outerRect, false, 1.0); |
RenderPass::Id rootRenderPassId = RenderPass::Id(1, 1); |
scoped_ptr<TestRenderPass> rootRenderPass = TestRenderPass::Create(); |
- rootRenderPass->SetNew(rootRenderPassId, outerRect, gfx::Rect(), gfx::Transform()); |
+ rootRenderPass->SetNew(rootRenderPassId, outerRect, outerRect, gfx::Transform()); |
scoped_ptr<SolidColorDrawQuad> outerQuad = SolidColorDrawQuad::Create(); |
outerQuad->SetNew(sharedQuadState.get(), outerRect, SK_ColorYELLOW); |
scoped_ptr<SolidColorDrawQuad> innerQuad = SolidColorDrawQuad::Create(); |
@@ -114,7 +114,7 @@ TEST_F(SoftwareRendererTest, tileQuad) |
int outerPixels = outerSize.width() * outerSize.height(); |
gfx::Size innerSize(98, 98); |
int innerPixels = innerSize.width() * innerSize.height(); |
- gfx::Rect outerRect(gfx::Point(), outerSize); |
+ gfx::Rect outerRect(outerSize); |
gfx::Rect innerRect(gfx::Point(1, 1), innerSize); |
setViewportSize(outerSize); |
initializeRenderer(); |
@@ -131,20 +131,20 @@ TEST_F(SoftwareRendererTest, tileQuad) |
for (int i = 0; i < innerPixels; i++) |
cyanPixels[i] = cyan; |
- resourceProvider()->setPixels(resourceYellow, reinterpret_cast<uint8_t*>(yellowPixels.get()), gfx::Rect(gfx::Point(), outerSize), gfx::Rect(gfx::Point(), outerSize), gfx::Vector2d()); |
- resourceProvider()->setPixels(resourceCyan, reinterpret_cast<uint8_t*>(cyanPixels.get()), gfx::Rect(gfx::Point(), innerSize), gfx::Rect(gfx::Point(), innerSize), gfx::Vector2d()); |
+ resourceProvider()->setPixels(resourceYellow, reinterpret_cast<uint8_t*>(yellowPixels.get()), gfx::Rect(outerSize), gfx::Rect(outerSize), gfx::Vector2d()); |
+ resourceProvider()->setPixels(resourceCyan, reinterpret_cast<uint8_t*>(cyanPixels.get()), gfx::Rect(innerSize), gfx::Rect(innerSize), gfx::Vector2d()); |
- gfx::Rect rect = gfx::Rect(gfx::Point(), deviceViewportSize()); |
+ gfx::Rect rootRect = gfx::Rect(deviceViewportSize()); |
scoped_ptr<SharedQuadState> sharedQuadState = SharedQuadState::Create(); |
sharedQuadState->SetAll(gfx::Transform(), 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(), gfx::Transform()); |
+ rootRenderPass->SetNew(rootRenderPassId, rootRect, rootRect, gfx::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); |
+ outerQuad->SetNew(sharedQuadState.get(), outerRect, outerRect, resourceYellow, gfx::RectF(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); |
+ innerQuad->SetNew(sharedQuadState.get(), innerRect, innerRect, resourceCyan, gfx::RectF(innerSize), innerSize, false, false, false, false, false); |
rootRenderPass->AppendQuad(innerQuad.PassAs<DrawQuad>()); |
rootRenderPass->AppendQuad(outerQuad.PassAs<DrawQuad>()); |