| Index: cc/output/software_renderer_unittest.cc
|
| diff --git a/cc/output/software_renderer_unittest.cc b/cc/output/software_renderer_unittest.cc
|
| index af4d7d1f715f435ce904239c7205238cc84c2fd4..0a6316af8b446bc5ebcf7575b68a347dd8cab8f1 100644
|
| --- a/cc/output/software_renderer_unittest.cc
|
| +++ b/cc/output/software_renderer_unittest.cc
|
| @@ -49,8 +49,8 @@ class SoftwareRendererTest : public testing::Test, public RendererClient {
|
| }
|
|
|
| // RendererClient implementation.
|
| - virtual gfx::Size DeviceViewportSize() const OVERRIDE {
|
| - return viewport_size_;
|
| + virtual gfx::Rect DeviceViewport() const OVERRIDE {
|
| + return gfx::Rect(viewport_size_);
|
| }
|
| virtual float DeviceScaleFactor() const OVERRIDE {
|
| return 1.f;
|
| @@ -113,8 +113,8 @@ TEST_F(SoftwareRendererTest, SolidColorQuad) {
|
|
|
| SkBitmap output;
|
| output.setConfig(SkBitmap::kARGB_8888_Config,
|
| - DeviceViewportSize().width(),
|
| - DeviceViewportSize().height());
|
| + DeviceViewport().width(),
|
| + DeviceViewport().height());
|
| output.allocPixels();
|
| renderer()->GetFramebufferPixels(output.getPixels(), outer_rect);
|
|
|
| @@ -165,7 +165,7 @@ TEST_F(SoftwareRendererTest, TileQuad) {
|
| gfx::Rect(inner_size),
|
| gfx::Vector2d());
|
|
|
| - gfx::Rect root_rect = gfx::Rect(DeviceViewportSize());
|
| + gfx::Rect root_rect = DeviceViewport();
|
|
|
| scoped_ptr<SharedQuadState> shared_quad_state = SharedQuadState::Create();
|
| shared_quad_state->SetAll(
|
| @@ -199,8 +199,8 @@ TEST_F(SoftwareRendererTest, TileQuad) {
|
|
|
| SkBitmap output;
|
| output.setConfig(SkBitmap::kARGB_8888_Config,
|
| - DeviceViewportSize().width(),
|
| - DeviceViewportSize().height());
|
| + DeviceViewport().width(),
|
| + DeviceViewport().height());
|
| output.allocPixels();
|
| renderer()->GetFramebufferPixels(output.getPixels(), outer_rect);
|
|
|
|
|