[CLOSED] In-browser software compositing

cc/software_renderer_unittest.cc

Index: cc/software_renderer_unittest.cc
diff --git a/cc/software_renderer_unittest.cc b/cc/software_renderer_unittest.cc
index 5608ee90707e8ccbdb6b6b801b1c5121b59cd1f8..9a1b9be6af46d2de838a2d04f70b2820ab414a7e 100644
--- a/cc/software_renderer_unittest.cc
+++ b/cc/software_renderer_unittest.cc
@@ -8,10 +8,10 @@
 #include "cc/quad_sink.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_draw_quad.h"
+#include "cc/software_output_device_impl.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_output_surface.h"
-#include "cc/test/fake_software_output_device.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/render_pass_test_common.h"
 #include "cc/test/render_pass_test_utils.h"
@@ -32,7 +32,7 @@ public:
     }
 
     void initializeRenderer() {
-        m_outputSurface = FakeOutputSurface::CreateSoftware(scoped_ptr<SoftwareOutputDevice>(new FakeSoftwareOutputDevice));
+        m_outputSurface = FakeOutputSurface::CreateSoftware(scoped_ptr<SoftwareOutputDevice>(new SoftwareOutputDeviceImpl));
         m_resourceProvider = ResourceProvider::create(m_outputSurface.get());
         m_renderer = SoftwareRenderer::create(this, resourceProvider(), softwareDevice());
     }
@@ -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,16 +131,14 @@ 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());
-
-    gfx::Rect rect = gfx::Rect(gfx::Point(), deviceViewportSize());
+    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());
 
     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, outerRect, outerRect, 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);
     scoped_ptr<TileDrawQuad> innerQuad = TileDrawQuad::Create();