Remove SoftwareOutputDevice::CopyToPixels and ::Scroll

These aren't called anywhere.

Review URL: https://codereview.chromium.org/1136663003

Cr-Commit-Position: refs/heads/master@{#329019}

6 files changed, 0 insertions, 70 deletions

diff --git a/cc/output/software_output_device.cc b/cc/output/software_output_device.cc
index f7bc61a..3692224 100644
--- a/cc/output/software_output_device.cc
+++ b/cc/output/software_output_device.cc
@@ -43,18 +43,6 @@ void SoftwareOutputDevice::EndPaint(SoftwareFrameData* frame_data) {
   frame_data->damage_rect = damage_rect_;
 }
 
-void SoftwareOutputDevice::CopyToPixels(const gfx::Rect& rect, void* pixels) {
-  DCHECK(surface_);
-  SkImageInfo info = SkImageInfo::MakeN32Premul(rect.width(), rect.height());
-  surface_->getCanvas()->readPixels(info, pixels, info.minRowBytes(), rect.x(),
-                                    rect.y());
-}
-
-void SoftwareOutputDevice::Scroll(const gfx::Vector2d& delta,
-                                  const gfx::Rect& clip_rect) {
-  NOTIMPLEMENTED();
-}
-
 void SoftwareOutputDevice::ReclaimSoftwareFrame(unsigned id) {
   NOTIMPLEMENTED();
 }
diff --git a/cc/output/software_output_device.h b/cc/output/software_output_device.h
index 89ab005..45ce831 100644
--- a/cc/output/software_output_device.h
+++ b/cc/output/software_output_device.h
@@ -48,14 +48,6 @@ class CC_EXPORT SoftwareOutputDevice {
   // that it holds to it.
   virtual void EndPaint(SoftwareFrameData* frame_data);
 
-  // Copies pixels inside |rect| from the current software framebuffer to
-  // |pixels|. Fails if there is no current softwareframebuffer.
-  virtual void CopyToPixels(const gfx::Rect& rect, void* pixels);
-
-  // Blit the pixel content of the SoftwareOutputDevice by |delta| with the
-  // write clipped to |clip_rect|.
-  virtual void Scroll(const gfx::Vector2d& delta, const gfx::Rect& clip_rect);
-
   // Discard the backing buffer in the surface provided by this instance.
   virtual void DiscardBackbuffer() {}
 
diff --git a/content/browser/android/in_process/synchronous_compositor_output_surface.cc b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
index a94c705..1e61994 100644
--- a/content/browser/android/in_process/synchronous_compositor_output_surface.cc
+++ b/content/browser/android/in_process/synchronous_compositor_output_surface.cc
@@ -51,9 +51,6 @@ class SynchronousCompositorOutputSurface::SoftwareDevice
     return surface_->current_sw_canvas_;
   }
   void EndPaint(cc::SoftwareFrameData* frame_data) override {}
-  void CopyToPixels(const gfx::Rect& rect, void* pixels) override {
-    NOTIMPLEMENTED();
-  }
 
  private:
   SynchronousCompositorOutputSurface* surface_;
diff --git a/content/browser/compositor/software_output_device_ozone_unittest.cc b/content/browser/compositor/software_output_device_ozone_unittest.cc
index 15306c1..a19465b 100644
--- a/content/browser/compositor/software_output_device_ozone_unittest.cc
+++ b/content/browser/compositor/software_output_device_ozone_unittest.cc
@@ -136,41 +136,3 @@ TEST_F(SoftwareOutputDeviceOzoneTest, CheckCorrectResizeBehavior) {
 
 }
 
-TEST_F(SoftwareOutputDeviceOzonePixelTest, CheckCopyToBitmap) {
-  const int width = 6;
-  const int height = 4;
-  const gfx::Rect area(width, height);
-  output_device_->Resize(area.size(), 1.f);
-  SkCanvas* canvas = output_device_->BeginPaint(area);
-
-  // Clear the background to black.
-  canvas->drawColor(SK_ColorBLACK);
-
-  cc::SoftwareFrameData frame;
-  output_device_->EndPaint(&frame);
-
-  // Draw a white rectangle.
-  gfx::Rect damage(area.width() / 2, area.height() / 2);
-  canvas = output_device_->BeginPaint(damage);
-  canvas->clipRect(gfx::RectToSkRect(damage), SkRegion::kReplace_Op);
-
-  canvas->drawColor(SK_ColorWHITE);
-
-  output_device_->EndPaint(&frame);
-
-  SkPMColor pixels[width * height];
-  output_device_->CopyToPixels(area, pixels);
-
-  // Check that the copied bitmap contains the same pixel values as what we
-  // painted.
-  const SkPMColor white = SkPreMultiplyColor(SK_ColorWHITE);
-  const SkPMColor black = SkPreMultiplyColor(SK_ColorBLACK);
-  for (int i = 0; i < area.height(); ++i) {
-    for (int j = 0; j < area.width(); ++j) {
-      if (j < damage.width() && i < damage.height())
-        EXPECT_EQ(white, pixels[i * area.width() + j]);
-      else
-        EXPECT_EQ(black, pixels[i * area.width() + j]);
-    }
-  }
-}
diff --git a/content/browser/compositor/software_output_device_win.cc b/content/browser/compositor/software_output_device_win.cc
index 2d6d004..94ceafd 100644
--- a/content/browser/compositor/software_output_device_win.cc
+++ b/content/browser/compositor/software_output_device_win.cc
@@ -96,12 +96,4 @@ void SoftwareOutputDeviceWin::EndPaint(cc::SoftwareFrameData* frame_data) {
   }
 }
 
-void SoftwareOutputDeviceWin::CopyToPixels(const gfx::Rect& rect,
-                                           void* pixels) {
-  DCHECK(contents_);
-  SkImageInfo info = SkImageInfo::MakeN32Premul(rect.width(), rect.height());
-  contents_->sk_canvas()->readPixels(
-      info, pixels, info.minRowBytes(), rect.x(), rect.y());
-}
-
 }  // namespace content
diff --git a/content/browser/compositor/software_output_device_win.h b/content/browser/compositor/software_output_device_win.h
index a171e8e..7063f20 100644
--- a/content/browser/compositor/software_output_device_win.h
+++ b/content/browser/compositor/software_output_device_win.h
@@ -29,7 +29,6 @@ class SoftwareOutputDeviceWin : public cc::SoftwareOutputDevice {
               float scale_factor) override;
   SkCanvas* BeginPaint(const gfx::Rect& damage_rect) override;
   void EndPaint(cc::SoftwareFrameData* frame_data) override;
-  void CopyToPixels(const gfx::Rect& rect, void* pixels) override;
 
  private:
   HWND hwnd_;