Add fromSurface optional parameter to devtools Page.CaptureScreenshot

content/browser/renderer_host/render_widget_host_impl.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
 #define CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 31 matching lines @@
 #include "content/public/common/page_zoom.h"
 #include "content/public/common/url_constants.h"
 #include "ipc/ipc_listener.h"
 #include "third_party/WebKit/public/platform/WebDisplayMode.h"
 #include "ui/base/ime/text_input_mode.h"
 #include "ui/base/ime/text_input_type.h"
 #include "ui/events/gesture_detection/gesture_provider_config_helper.h"
 #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;
 
 namespace blink {
 class WebInputEvent;
 class WebMouseEvent;
 struct WebCompositionUnderline;
 }
 
@@ skipping 140 matching lines @@
 
   // Forces redraw in the renderer and when the update reaches the browser
   // grabs snapshot from the compositor. On MacOS, the snapshot is taken from
   // the Cocoa view for end-to-end testing purposes. Returns a gfx::Image that
   // is backed by an NSImage on MacOS or by an SkBitmap otherwise. The
   // gfx::Image may be empty if the snapshot failed.
   using GetSnapshotFromBrowserCallback =
       base::Callback<void(const gfx::Image&)>;
   void GetSnapshotFromBrowser(const GetSnapshotFromBrowserCallback& callback);
 
+  using GetSurfaceSnapshotFromBrowserCallback =
+      base::Callback<void(const SkBitmap&)>;
+  void GetSurfaceSnapshotFromBrowser(

[dgozman, 2017/03/08 19:21:36]

Can we unify this with the other method by always returning SkBitmap or
gfx::Image?

[dvallet, 2017/03/09 06:19:47]

Done.

+      const GetSurfaceSnapshotFromBrowserCallback& callback);
+
   const NativeWebKeyboardEvent* GetLastKeyboardEvent() const;
 
   // Sets the View of this RenderWidgetHost.
   void SetView(RenderWidgetHostViewBase* view);
 
   RenderWidgetHostDelegate* delegate() const { return delegate_; }
 
   bool empty() const { return current_size_.IsEmpty(); }
 
   // Called when a renderer object already been created for this host, and we
@@ skipping 466 matching lines @@
   void OnUnexpectedEventAck(UnexpectedEventAckType type) override;
 
   void OnSyntheticGestureCompleted(SyntheticGesture::Result result);
 
   // Called when there is a new auto resize (using a post to avoid a stack
   // which may get in recursive loops).
   void DelayedAutoResized();
 
   void WindowSnapshotReachedScreen(int snapshot_id);
 
+  void OnSnapshotFromSurfaceReceived(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)
   // 2. Grants permissions to filenames
   // 3. Grants permissions to file system files.
   // 4. Register the files with the IsolatedContext.
   void GrantFileAccessFromDropData(DropData* drop_data);
 
   // true if a renderer has once been valid. We use this flag to display a sad
   // tab only when we lose our renderer and not if a paint occurs during
@@ skipping 144 matching lines @@
   // receipt of those messages (unless FirstPaintAfterLoad is prevented from
   // being sent, in which case the timer should fire).
   bool received_paint_after_load_;
 
   RenderWidgetHostLatencyTracker latency_tracker_;
 
   int next_browser_snapshot_id_;
   using PendingSnapshotMap = std::map<int, GetSnapshotFromBrowserCallback>;
   PendingSnapshotMap pending_browser_snapshots_;
 
+  using PendingSnapshotFromSurfaceMap =
+      std::map<int, GetSurfaceSnapshotFromBrowserCallback>;
+  PendingSnapshotFromSurfaceMap pending_surface_browser_snapshots_;
+
   // Indicates whether a RenderFramehost has ownership, in which case this
   // object does not self destroy.
   bool owned_by_render_frame_host_;
 
   // Indicates whether this RenderWidgetHost thinks is focused. This is trying
   // to match what the renderer process knows. It is different from
   // RenderWidgetHostView::HasFocus in that in that the focus request may fail,
   // causing HasFocus to return false when is_focused_ is true.
   bool is_focused_;
 
@@ skipping 32 matching lines @@
 #endif
 
   base::WeakPtrFactory<RenderWidgetHostImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_RENDER_WIDGET_HOST_IMPL_H_