Consistent CopyFromSurface() API, consolidated to RWHV

content/public/browser/render_widget_host_view.h

Index: content/public/browser/render_widget_host_view.h
diff --git a/content/public/browser/render_widget_host_view.h b/content/public/browser/render_widget_host_view.h
index 71c693bf7c3c09c90b6df776d1afe9dff015fbf2..8d52b0f19d83c20cdb3a730bd2157d6619647d24 100644
--- a/content/public/browser/render_widget_host_view.h
+++ b/content/public/browser/render_widget_host_view.h
@@ -10,8 +10,10 @@
 #include "base/strings/string16.h"
 #include "build/build_config.h"
 #include "content/common/content_export.h"
+#include "content/public/browser/readback_types.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/skia/include/core/SkColor.h"
+#include "third_party/skia/include/core/SkImageInfo.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace gfx {
@@ -20,6 +22,10 @@ class Rect;
 class Size;
 }
 
+namespace media {
+class VideoFrame;
+}
+
 namespace ui {
 class TextInputClient;
 class AcceleratedWidgetMac;
@@ -96,8 +102,6 @@ class CONTENT_EXPORT RenderWidgetHostView {
   virtual void Focus() = 0;
   // Returns true if the View currently has the focus.
   virtual bool HasFocus() const = 0;
-  // Returns true is the current display surface is available.
-  virtual bool IsSurfaceAvailableForCopy() const = 0;
 
   // Shows/hides the view.  These must always be called together in pairs.
   // It is not legal to call Hide() multiple times in a row.
@@ -151,6 +155,61 @@ class CONTENT_EXPORT RenderWidgetHostView {
   // visible viewport.
   virtual void SetInsets(const gfx::Insets& insets) = 0;
 
+  // Returns true if the current display surface is available, a prerequisite
+  // for CopyFromSurface() or CopyFromSurfaceToVideoFrame() to succeed.
+  virtual bool IsSurfaceAvailableForCopy() const = 0;
+
+  // Copies the given subset of the view's surface, optionally scales it, and
+  // returns the result as a bitmap via the provided callback. This is meant for
+  // one-off snapshots. For continuous video capture of the surface, please use
+  // BeginFrameSubscription().
+  //
+  // |src_rect| is either the subset of the view's surface, in view coordinates,
+  // or empty to indicate that all of it should be copied. This is NOT the same
+  // coordinate system as that used GetViewBounds() (https://crbug.com/73362).
+  //
+  // |output_size| is the size of the resulting bitmap, or empty to indicate no
+  // scaling is desired. If an empty size is provided, note that the resulting
+  // bitmap's size may not be the same as |src_rect.size()| due to the pixel
+  // scale used by the underlying device.
+  //
+  // |callback| is always invoked, at some point in the future, with success/
+  // fail status and an SkBitmap containing the copied pixel data. It may be
+  // called sychronously or asynchronously.
+  //
+  // If the view's renderer is suspended (see WasOccluded()), this may result in
+  // copying old data or failing.
+  virtual void CopyFromSurface(const gfx::Rect& src_rect,
+                               const gfx::Size& output_size,
+                               const ReadbackRequestCallback& callback,
+                               const SkColorType color_type) = 0;
+
+  // Copies the given subset of the view's surface, scales/letterboxes it, and
+  // returns the result within the provided media::VideoFrame. This is meant for
+  // one-off snapshots. For continuous video capture of the surface, please use
+  // BeginFrameSubscription().
+  //
+  // |src_rect| is either the subset of the view's surface, in view coordinates,
+  // or empty to indicate that all of it should be copied. This is NOT the same
+  // coordinate system as that used GetViewBounds() (https://crbug.com/73362).
+  //
+  // The |target| must use a pixel format supported by the platform. The size of
+  // the source region and the target together will determine how the content is
+  // positioned and scaled within the video frame. The aspect ratio of the
+  // source region will always be preserved, with letterboxing/pillarboxing
+  // applied to fill the entire frame.
+  //
+  // |callback| is always invoked, at some point in the future, with the region
+  // within |target| where the content was placed and a boolean success/fail
+  // flag. It may be called sychronously or asynchronously.
+  //
+  // If the view's renderer is suspended (see WasOccluded()), this may result in
+  // copying old data or failing.
+  virtual void CopyFromSurfaceToVideoFrame(
+      const gfx::Rect& src_rect,
+      scoped_refptr<media::VideoFrame> target,
+      const base::Callback<void(const gfx::Rect&, bool)>& callback) = 0;
+
   // Begin subscribing for presentation events and captured frames.
   // |subscriber| is now owned by this object, it will be called only on the
   // UI thread.