Consistent CopyFromSurface() API, consolidated to RWHV

extensions/browser/api/web_contents_capture_client.cc

 // Copyright 2013 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 "extensions/browser/api/web_contents_capture_client.h"
 
 #include "base/base64.h"
 #include "base/strings/stringprintf.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_function.h"
 #include "extensions/common/constants.h"
 #include "third_party/skia/include/core/SkBitmap.h"
-#include "ui/display/display.h"
-#include "ui/display/screen.h"
 #include "ui/gfx/codec/jpeg_codec.h"
 #include "ui/gfx/codec/png_codec.h"
-#include "ui/gfx/geometry/size_conversions.h"
 
 using content::RenderWidgetHost;
 using content::RenderWidgetHostView;
 using content::WebContents;
 
 namespace extensions {
 
 using api::extension_types::ImageDetails;
 
 bool WebContentsCaptureClient::CaptureAsync(
@@ skipping 16 matching lines @@
 
   if (image_details) {
     if (image_details->format != api::extension_types::IMAGE_FORMAT_NONE)
       image_format_ = image_details->format;
     if (image_details->quality.get())
       image_quality_ = *image_details->quality;
   }
 
   // TODO(miu): Account for fullscreen render widget?  http://crbug.com/419878
   RenderWidgetHostView* const view = web_contents->GetRenderWidgetHostView();
-  RenderWidgetHost* const host = view ? view->GetRenderWidgetHost() : nullptr;
-  if (!view || !host) {
+  if (!view) {
     OnCaptureFailure(FAILURE_REASON_VIEW_INVISIBLE);
     return false;
   }
-
-  // By default, the requested bitmap size is the view size in screen
-  // coordinates.  However, if there's more pixel detail available on the
-  // current system, increase the requested bitmap size to capture it all.
-  const gfx::Size view_size = view->GetViewBounds().size();
-  gfx::Size bitmap_size = view_size;
-  const gfx::NativeView native_view = view->GetNativeView();
-  display::Screen* const screen = display::Screen::GetScreen();
-  const float scale =
-      screen->GetDisplayNearestWindow(native_view).device_scale_factor();
-  if (scale > 1.0f)
-    bitmap_size = gfx::ScaleToCeiledSize(view_size, scale);
-
-  host->CopyFromBackingStore(gfx::Rect(view_size), bitmap_size, callback,
-                             kN32_SkColorType);
+  view->CopyFromSurface(gfx::Rect(),  // Copy entire surface area.

[Devlin, 2017/02/28 14:03:02]

Should we be checking IsSurfaceAvailableForCopy()?

[miu, 2017/03/01 01:17:02]

It's actually perfectly acceptable not to. One of the changes I made in the RWHV
impls was to guarantee the callback is always run. So, if the surface is not
available, the callback will be run with a non-success flag.

+                        gfx::Size(),  // Result contains device-level detail.
+                        callback, kN32_SkColorType);
   return true;
 }
 
-void WebContentsCaptureClient::CopyFromBackingStoreComplete(
+void WebContentsCaptureClient::CopyFromSurfaceComplete(
     const SkBitmap& bitmap,
     content::ReadbackResponse response) {
   if (response == content::READBACK_SUCCESS) {
     OnCaptureSuccess(bitmap);
     return;
   }
   // TODO(wjmaclean): Improve error reporting. Why aren't we passing more
   // information here?
   std::string reason;
   switch (response) {
@@ skipping 45 matching lines @@
                                      data.size());
 
   base::Base64Encode(stream_as_string, base64_result);
   base64_result->insert(
       0, base::StringPrintf("data:%s;base64,", mime_type.c_str()));
 
   return true;
 }
 
 }  // namespace extensions