Consistent CopyFromSurface() API, consolidated to RWHV

content/public/browser/render_widget_host.h

Index: content/public/browser/render_widget_host.h
diff --git a/content/public/browser/render_widget_host.h b/content/public/browser/render_widget_host.h
index 48336e4d4986bf978a8e762199e93d7b0c43fdb4..068e826699696b8f7f939073ab8338526e4a3f38 100644
--- a/content/public/browser/render_widget_host.h
+++ b/content/public/browser/render_widget_host.h
@@ -10,7 +10,6 @@
 #include "base/callback.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/native_web_keyboard_event.h"
-#include "content/public/browser/readback_types.h"
 #include "content/public/common/drop_data.h"
 #include "ipc/ipc_channel.h"
 #include "ipc/ipc_sender.h"
@@ -18,14 +17,9 @@
 #include "third_party/WebKit/public/platform/WebGestureEvent.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/WebKit/public/web/WebTextDirection.h"
-#include "third_party/skia/include/core/SkImageInfo.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/surface/transport_dib.h"
 
-namespace gfx {
-class Rect;
-}
-
 namespace blink {
 class WebMouseEvent;
 class WebMouseWheelEvent;
@@ -163,27 +157,6 @@ class CONTENT_EXPORT RenderWidgetHost : public IPC::Sender {
   // contents, but e.g. in the omnibox.
   virtual void SetActive(bool active) = 0;
 
-  // Copies the given subset of the backing store, and passes the result as a
-  // bitmap to a callback.
-  //
-  // If |src_rect| is empty, the whole contents is copied. If non empty
-  // |accelerated_dst_size| is given and accelerated compositing is active, the
-  // content is shrunk so that it fits in |accelerated_dst_size|. If
-  // |accelerated_dst_size| is larger than the content size, the content is not
-  // resized. If |accelerated_dst_size| is empty, the size copied from the
-  // source contents is used. |callback| is invoked with true on success, false
-  // otherwise, along with a SkBitmap containing the copied pixel data.
-  //
-  // NOTE: |callback| is called synchronously if the backing store is available.
-  // When accelerated compositing is active, |callback| may be called
-  // asynchronously.
-  virtual void CopyFromBackingStore(const gfx::Rect& src_rect,
-                                    const gfx::Size& accelerated_dst_size,
-                                    const ReadbackRequestCallback& callback,
-                                    const SkColorType color_type) = 0;
-  // Ensures that the view does not drop the backing store even when hidden.
-  virtual bool CanCopyFromBackingStore() = 0;
-
   // Forwards the given message to the renderer. These are called by
   // the view when it has received a message.
   virtual void ForwardMouseEvent(