Consistent CopyFromSurface() API, consolidated to RWHV

content/browser/devtools/protocol/color_picker.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/color_picker.h"
 
 #include "base/bind.h"
 #include "build/build_config.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
@@ skipping 65 matching lines @@
 }
 
 void ColorPicker::UpdateFrame() {
   if (!host_)
     return;
   RenderWidgetHostViewBase* view =
       static_cast<RenderWidgetHostViewBase*>(host_->GetView());
   if (!view)
     return;
 
-  gfx::Size size = view->GetViewBounds().size();
-  view->CopyFromCompositingSurface(
-      gfx::Rect(size), size,
-      base::Bind(&ColorPicker::FrameUpdated,
-                 weak_factory_.GetWeakPtr()),
+  // TODO(miu): This is the wrong size. It's the size of the view on-screen, and

[dgozman, 2017/02/28 19:13:52]

Does cc::CompositorFrameMetadata work? We have it in OnSwapCompositorFrame (just
not passed here from PageHandler class).

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

Possibly. Here, I'm not making any functional change. The TODO I added here is
just like the one in PageHandler: It'd be best for there to be a simple API for
getting the size, rather than burden callers with grabbing
CompositorFrameMetadata and doing a bunch of math themselves.

+  // not the rendering size of the view. The latter is what is wanted here, so
+  // that the resulting bitmap's pixel coordinates line-up with the
+  // blink::WebMouseEvent coordinates. http://crbug.com/73362
+  gfx::Size should_be_rendering_size = view->GetViewBounds().size();
+  view->CopyFromSurface(
+      gfx::Rect(), should_be_rendering_size,
+      base::Bind(&ColorPicker::FrameUpdated, weak_factory_.GetWeakPtr()),
       kN32_SkColorType);
 }
 
 void ColorPicker::ResetFrame() {
   frame_.reset();
   last_cursor_x_ = -1;
   last_cursor_y_ = -1;
 }
 
 void ColorPicker::FrameUpdated(const SkBitmap& bitmap,
@@ skipping 152 matching lines @@
       gfx::Point(kHotspotOffset * device_scale_factor,
                  kHotspotOffset * device_scale_factor);
 
   cursor.InitFromCursorInfo(cursor_info);
   DCHECK(host_);
   host_->SetCursor(cursor);
 }
 
 }  // namespace protocol
 }  // namespace content