Add fromSurface optional parameter to devtools Page.CaptureScreenshot

content/browser/renderer_host/render_widget_host_impl.h

Index: content/browser/renderer_host/render_widget_host_impl.h
diff --git a/content/browser/renderer_host/render_widget_host_impl.h b/content/browser/renderer_host/render_widget_host_impl.h
index b6aa99ec6f3c4147adec40a795432f45b41385ef..c27abd27158de48e353eebbf26d9c50516a670ab 100644
--- a/content/browser/renderer_host/render_widget_host_impl.h
+++ b/content/browser/renderer_host/render_widget_host_impl.h
@@ -49,6 +49,7 @@
 #include "ui/events/latency_info.h"
 #include "ui/gfx/native_widget_types.h"
 
+class SkBitmap;
 struct FrameHostMsg_HittestData_Params;
 struct ViewHostMsg_SelectionBounds_Params;
 struct ViewHostMsg_UpdateRect_Params;
@@ -209,6 +210,11 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost,
       base::Callback<void(const gfx::Image&)>;
   void GetSnapshotFromBrowser(const GetSnapshotFromBrowserCallback& callback);
 
+  using GetBitmapSnapshotFromBrowserCallback =
+      base::Callback<void(const SkBitmap&)>;
+  void GetBitmapSnapshotFromBrowser(
+      const GetBitmapSnapshotFromBrowserCallback& callback);
+
   const NativeWebKeyboardEvent* GetLastKeyboardEvent() const;
 
   // Sets the View of this RenderWidgetHost.
@@ -693,6 +699,11 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost,
 
   void WindowSnapshotReachedScreen(int snapshot_id);
 
+  void OnBitmapSnapshotReceived(int snapshot_id,
+                                int retry_count,
+                                const SkBitmap& bitmap,
+                                ReadbackResponse response);
+
   void OnSnapshotReceived(int snapshot_id, const gfx::Image& image);
 
   // 1. Grants permissions to URL (if any)
@@ -857,6 +868,10 @@ class CONTENT_EXPORT RenderWidgetHostImpl : public RenderWidgetHost,
   using PendingSnapshotMap = std::map<int, GetSnapshotFromBrowserCallback>;
   PendingSnapshotMap pending_browser_snapshots_;
 
+  using PendingBitmapSnapshotMap =
+      std::map<int, GetBitmapSnapshotFromBrowserCallback>;
+  PendingBitmapSnapshotMap pending_bitmap_browser_snapshots_;
+
   // Indicates whether a RenderFramehost has ownership, in which case this
   // object does not self destroy.
   bool owned_by_render_frame_host_;