Add fromSurface optional parameter to devtools Page.CaptureScreenshot

content/browser/devtools/protocol/page_handler.cc

 // Copyright 2014 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/devtools/protocol/page_handler.h"
 
+#include <algorithm>
+#include <memory>
 #include <string>
+#include <utility>
+#include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/task_scheduler/post_task.h"
@@ skipping 16 matching lines @@
 #include "content/public/browser/storage_partition.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/referrer.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/page_transition_types.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "ui/gfx/geometry/size_conversions.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/image/image_util.h"
+#include "ui/gfx/switches.h"
 #include "ui/snapshot/snapshot.h"
 #include "url/gurl.h"
 
 namespace content {
 namespace protocol {
 
 namespace {
 
 static const char kPng[] = "png";
 static const char kJpeg[] = "jpeg";
@@ skipping 223 matching lines @@
       return Response::OK();
     }
   }
 
   return Response::InvalidParams("No entry with passed id");
 }
 
 void PageHandler::CaptureScreenshot(
     Maybe<std::string> format,
     Maybe<int> quality,
+    Maybe<bool> from_surface,
     std::unique_ptr<CaptureScreenshotCallback> callback) {
   if (!host_ || !host_->GetRenderWidgetHost()) {
     callback->sendFailure(Response::InternalError());
     return;
   }
 
   std::string screenshot_format = format.fromMaybe(kPng);
   int screenshot_quality = quality.fromMaybe(kDefaultScreenshotQuality);
+  bool screenshot_from_surface = from_surface.fromMaybe(false);
 
+  if (screenshot_from_surface) {
+    host_->GetRenderWidgetHost()->GetSurfaceSnapshotFromBrowser(base::Bind(
+        &PageHandler::ScreenshotFromSurfaceCaptured, weak_factory_.GetWeakPtr(),
+        base::Passed(std::move(callback)), screenshot_format,
+        screenshot_quality));
+    return;
+  }
   host_->GetRenderWidgetHost()->GetSnapshotFromBrowser(
       base::Bind(&PageHandler::ScreenshotCaptured, weak_factory_.GetWeakPtr(),
                  base::Passed(std::move(callback)), screenshot_format,
                  screenshot_quality));
 }
 
 void PageHandler::PrintToPDF(std::unique_ptr<PrintToPDFCallback> callback) {
   callback->sendFailure(Response::Error("PrintToPDF is not implemented"));
   return;
 }
@@ skipping 268 matching lines @@
     int quality,
     const gfx::Image& image) {
   if (image.IsEmpty()) {
     callback->sendFailure(Response::Error("Unable to capture screenshot"));
     return;
   }
 
   callback->sendSuccess(EncodeImage(image, format, quality));
 }
 
+void PageHandler::ScreenshotFromSurfaceCaptured(
+    std::unique_ptr<CaptureScreenshotCallback> callback,
+    const std::string& format,
+    int quality,
+    const SkBitmap& bitmap) {
+  if (bitmap.drawsNothing()) {
+    callback->sendFailure(Response::Error("Unable to capture screenshot"));
+    return;
+  }
+
+  base::PostTaskAndReplyWithResult(
+      FROM_HERE,
+      base::Bind(&EncodeImage, gfx::Image::CreateFrom1xBitmap(bitmap), format,
+                 quality),
+      base::Bind(&PageHandler::ScreenshotFromSurfaceEncoded,

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

You can bind directly to callback:

base::Bind(&CaptureScreenshotCallback::sendSuccess,
base::Passed(std::move(callback)))

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

Done.

+                 weak_factory_.GetWeakPtr(),
+                 base::Passed(std::move(callback))));
+}
+
+void PageHandler::ScreenshotFromSurfaceEncoded(
+    std::unique_ptr<CaptureScreenshotCallback> callback,
+    const std::string& data) {
+  callback->sendSuccess(data);
+}
+
 void PageHandler::OnColorPicked(int r, int g, int b, int a) {
   frontend_->ColorPicked(
       DOM::RGBA::Create().SetR(r).SetG(g).SetB(b).SetA(a).Build());
 }
 
 Response PageHandler::StopLoading() {
   WebContentsImpl* web_contents = GetWebContents();
   if (!web_contents)
     return Response::InternalError();
   web_contents->Stop();
   return Response::OK();
 }
 
 }  // namespace protocol
 }  // namespace content