Add fromSurface optional parameter to devtools Page.CaptureScreenshot

content/browser/renderer_host/render_widget_host_impl.cc

 // 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.
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 73 matching lines @@
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/events/blink/web_input_event_traits.h"
 #include "ui/events/event.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/gfx/color_space.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/geometry/vector2d_conversions.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_skia.h"
 #include "ui/gfx/skbitmap_operations.h"
+#include "ui/gfx/switches.h"
 #include "ui/snapshot/snapshot.h"
 
 #if defined(OS_ANDROID)
 #include "ui/android/view_android.h"
 #else
 #include "content/browser/compositor/image_transport_factory.h"
 // nogncheck as dependency of "ui/compositor" is on non-Android platforms only.
 #include "ui/compositor/compositor.h"  // nogncheck
 #endif
 
@@ skipping 1339 matching lines @@
         BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE)));
   }
 #endif
   pending_browser_snapshots_.insert(std::make_pair(id, callback));
   ui::LatencyInfo latency_info;
   latency_info.AddLatencyNumber(ui::WINDOW_SNAPSHOT_FRAME_NUMBER_COMPONENT, 0,
                                 id);
   Send(new ViewMsg_ForceRedraw(GetRoutingID(), latency_info));
 }
 
+void RenderWidgetHostImpl::GetBitmapSnapshotFromBrowser(
+    const GetBitmapSnapshotFromBrowserCallback& callback) {
+  int id = next_browser_snapshot_id_++;
+
+  pending_bitmap_browser_snapshots_.insert(std::make_pair(id, callback));
+  ui::LatencyInfo latency_info;
+  latency_info.AddLatencyNumber(ui::WINDOW_SNAPSHOT_FRAME_NUMBER_COMPONENT, 0,
+                                id);
+  Send(new ViewMsg_ForceRedraw(GetRoutingID(), latency_info));
+}
+
 const NativeWebKeyboardEvent*
     RenderWidgetHostImpl::GetLastKeyboardEvent() const {
   return input_router_->GetLastKeyboardEvent();
 }
 
 void RenderWidgetHostImpl::SelectionChanged(const base::string16& text,
                                             uint32_t offset,
                                             const gfx::Range& range) {
   if (view_)
     view_->SelectionChanged(text, static_cast<size_t>(offset), range);
@@ skipping 881 matching lines @@
                                   is_running_navigation_hint_task);
 }
 
 void RenderWidgetHostImpl::DidReceiveRendererFrame() {
   view_->DidReceiveRendererFrame();
 }
 
 void RenderWidgetHostImpl::WindowSnapshotReachedScreen(int snapshot_id) {
   DCHECK(base::MessageLoopForUI::IsCurrent());
 
+  if (base::CommandLine::ForCurrentProcess()->HasSwitch(switches::kHeadless)) {

[Eric Seckler, 2017/03/06 07:32:53]

If we use the headless switch to determine how we do the capture and which
callbacks we look for, can we add documentation/dchecks to
GetSnapshotFromBrowser / GetBitmapSnapshotFromBrowser that says when either
method is supported?

Alternatively, maybe we can make both work on all platforms? E.g. by checking
whether pending_browser_snapshots_ and/or pending_bitmap_browser_snapshots_ are
non-empty and then taking the corresponding snapshot - or both.

[dgozman, 2017/03/06 18:45:34]

We should not special-case headless here.

[dvallet, 2017/03/08 02:26:14]

Done.

[dvallet, 2017/03/08 02:26:14]

Done. I opted to check both.

+    // In headless mode, we capture the whole view.
+    GetView()->CopyFromSurface(
+        gfx::Rect(), gfx::Size(),
+        base::Bind(&RenderWidgetHostImpl::OnBitmapSnapshotReceived,
+                   weak_factory_.GetWeakPtr(), snapshot_id, 0),
+        kN32_SkColorType);
+    return;
+  }
+
 #if defined(OS_ANDROID)
   // On Android, call sites should pass in the bounds with correct offset
   // to capture the intended content area.
   gfx::Rect snapshot_bounds(GetView()->GetViewBounds());
   snapshot_bounds.Offset(0, GetView()->GetNativeView()->content_offset().y());
 #else
   gfx::Rect snapshot_bounds(GetView()->GetViewBounds().size());
 #endif
 
   gfx::Image image;
   if (ui::GrabViewSnapshot(GetView()->GetNativeView(), snapshot_bounds,
                            &image)) {
     OnSnapshotReceived(snapshot_id, image);
     return;
   }
 
   ui::GrabViewSnapshotAsync(
       GetView()->GetNativeView(), snapshot_bounds,
       base::Bind(&RenderWidgetHostImpl::OnSnapshotReceived,
                  weak_factory_.GetWeakPtr(), snapshot_id));
 }
 
+void RenderWidgetHostImpl::OnBitmapSnapshotReceived(int snapshot_id,
+                                                    int retry_count,
+                                                    const SkBitmap& bitmap,
+                                                    ReadbackResponse response) {
+  static const int kMaxRetries = 5;
+  if (response != READBACK_SUCCESS && retry_count < kMaxRetries) {
+    GetView()->CopyFromSurface(
+        gfx::Rect(), gfx::Size(),
+        base::Bind(&RenderWidgetHostImpl::OnBitmapSnapshotReceived,
+                   weak_factory_.GetWeakPtr(), snapshot_id, retry_count + 1),
+        kN32_SkColorType);
+    return;
+  }
+  // Any pending snapshots with a lower ID than the one received are considered
+  // to be implicitly complete, and returned the same snapshot data.
+  PendingBitmapSnapshotMap::iterator it =
+      pending_bitmap_browser_snapshots_.begin();
+  while (it != pending_bitmap_browser_snapshots_.end()) {
+    if (it->first <= snapshot_id) {
+      it->second.Run(bitmap);
+      pending_bitmap_browser_snapshots_.erase(it++);
+    } else {
+      ++it;
+    }
+  }
+}
+
 void RenderWidgetHostImpl::OnSnapshotReceived(int snapshot_id,
                                               const gfx::Image& image) {
   // Any pending snapshots with a lower ID than the one received are considered
   // to be implicitly complete, and returned the same snapshot data.
   PendingSnapshotMap::iterator it = pending_browser_snapshots_.begin();
   while (it != pending_browser_snapshots_.end()) {
     if (it->first <= snapshot_id) {
       it->second.Run(image);
       pending_browser_snapshots_.erase(it++);
     } else {
@@ skipping 119 matching lines @@
     // different from the receiver's.
     file_system_file.url =
         GURL(storage::GetIsolatedFileSystemRootURIString(
                  file_system_url.origin(), filesystem_id, std::string())
                  .append(register_name));
     file_system_file.filesystem_id = filesystem_id;
   }
 }
 
 }  // namespace content