Part 1/3 (compositor) of adding with device scale factor to transport surfaces

cc/output/gl_renderer_unittest.cc

Index: cc/output/gl_renderer_unittest.cc
diff --git a/cc/output/gl_renderer_unittest.cc b/cc/output/gl_renderer_unittest.cc
index 2ee3a6370308c64115bc7c1f618276bff5ed5283..632fc72c88832a0a4f3aa6fb7983d760694cfa46 100644
--- a/cc/output/gl_renderer_unittest.cc
+++ b/cc/output/gl_renderer_unittest.cc
@@ -166,6 +166,9 @@ class FakeRendererClient : public RendererClient {
     static gfx::Size fake_size(1, 1);
     return fake_size;
   }
+  virtual float DeviceScaleFactor() const OVERRIDE {
+    return 1.f;

[danakj, 2013/05/22 14:08:42]

Can we have a test where this is != 1?

[ccameron, 2013/05/22 18:26:11]

The test wasn't verifying any of the Reshape arguments before (viewport size is
always 1x1) ... I've added a test that verifies the size and the scale factor.

+  }
   virtual const LayerTreeSettings& Settings() const OVERRIDE {
     static LayerTreeSettings fake_settings;
     return fake_settings;
@@ -1437,7 +1440,8 @@ class OutputSurfaceMockContext : public TestWebGraphicsContext3D {
   MOCK_METHOD0(discardBackbufferCHROMIUM, void());
   MOCK_METHOD2(bindFramebuffer, void(WGC3Denum target, WebGLId framebuffer));
   MOCK_METHOD0(prepareTexture, void());
-  MOCK_METHOD2(reshape, void(int width, int height));
+  MOCK_METHOD3(reshapeWithScaleFactor,
+               void(int width, int height, float scale_factor));
   MOCK_METHOD4(drawElements,
                void(WGC3Denum mode,
                     WGC3Dsizei count,
@@ -1462,7 +1466,7 @@ class MockOutputSurface : public OutputSurface {
   MOCK_METHOD1(SendFrameToParentCompositor, void(CompositorFrame* frame));
   MOCK_METHOD0(EnsureBackbuffer, void());
   MOCK_METHOD0(DiscardBackbuffer, void());
-  MOCK_METHOD1(Reshape, void(gfx::Size size));
+  MOCK_METHOD2(Reshape, void(gfx::Size size, float scale_factor));
   MOCK_METHOD0(BindFramebuffer, void());
   MOCK_METHOD2(PostSubBuffer, void(gfx::Rect rect, const LatencyInfo&));
   MOCK_METHOD1(SwapBuffers, void(const LatencyInfo&));
@@ -1490,7 +1494,7 @@ class MockOutputSurfaceTest : public testing::Test, public FakeRendererClient {
 
     EXPECT_CALL(output_surface_, EnsureBackbuffer()).WillRepeatedly(Return());
 
-    EXPECT_CALL(output_surface_, Reshape(_)).Times(1);
+    EXPECT_CALL(output_surface_, Reshape(_, _)).Times(1);
 
     EXPECT_CALL(output_surface_, BindFramebuffer()).Times(1);