ui: Remove SkCanvas methods from drag utils.

ui/views/controls/menu/menu_controller.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 "ui/views/controls/menu/menu_controller.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/display/screen.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/vector2d.h"
+#include "ui/gfx/image/image.h"
+#include "ui/gfx/image/image_skia.h"
+#include "ui/gfx/image/image_skia_rep.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/menu/menu_config.h"
 #include "ui/views/controls/menu/menu_controller_delegate.h"
 #include "ui/views/controls/menu/menu_host_root_view.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/menu_scroll_view_container.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/drag_utils.h"
@@ skipping 1204 matching lines @@
   MenuItemView* item = state_.item;
   DCHECK(item);
   // Points are in the coordinates of the submenu, need to map to that of
   // the selected item. Additionally source may not be the parent of
   // the selected item, so need to map to screen first then to item.
   gfx::Point press_loc(location);
   View::ConvertPointToScreen(source->GetScrollViewContainer(), &press_loc);
   View::ConvertPointFromScreen(item, &press_loc);
   gfx::Point widget_loc(press_loc);
   View::ConvertPointToWidget(item, &widget_loc);
-  std::unique_ptr<gfx::Canvas> canvas(GetCanvasForDragImage(
-      source->GetWidget(), gfx::Size(item->width(), item->height())));
-  item->PaintButton(canvas.get(), MenuItemView::PB_FOR_DRAG);
+
+  float raster_scale = ScaleFactorForDragFromWidget(source->GetWidget());
+  gfx::Canvas canvas(item->size(), raster_scale, false);

[sadrul, 2017/04/04 04:09:03]

false /* is_opaque */

[danakj, 2017/04/04 14:46:16]

Done.

+  item->PaintButton(&canvas, MenuItemView::PB_FOR_DRAG);
+  gfx::ImageSkia image(gfx::ImageSkiaRep(canvas.GetBitmap(), raster_scale));
 
   OSExchangeData data;
   item->GetDelegate()->WriteDragData(item, &data);
-  drag_utils::SetDragImageOnDataObject(*canvas,
-                                       press_loc.OffsetFromOrigin(),
-                                       &data);
+  drag_utils::SetDragImageOnDataObject(std::move(image),

[sadrul, 2017/04/04 04:14:08]

Oh btw: SetDragImageOnDataObject() takes a const&. Is doing a std::move() here
OK?

Also, I assume this std::move() here does a copy, since gfx::ImageSkia does not
have a move ctor/assign op?

[danakj, 2017/04/04 14:46:16]

move is just a static_cast to a gfx::ImageSkia&&. If the method takes a const&
it would still bind to that. const& can bind to an rvalue or an lvalue. That's
why SetDragImageOnDataObject(MakesAnRvalue()) would work. I guess there's no
point tho, I wanted to say I'm giving up ownership of the bitmap but yeh.

+                                       press_loc.OffsetFromOrigin(), &data);
+
   StopScrolling();
   int drag_ops = item->GetDelegate()->GetDragOperations(item);
   did_initiate_drag_ = true;
   base::WeakPtr<MenuController> this_ref = AsWeakPtr();
   // TODO(varunjain): Properly determine and send DRAG_EVENT_SOURCE below.
   item->GetWidget()->RunShellDrag(NULL, data, widget_loc, drag_ops,
       ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE);
   // MenuController may have been deleted so check before accessing member
   // variables.
   if (this_ref)
@@ skipping 1447 matching lines @@
   if (hot_button_)
     hot_button_->SetHotTracked(false);
   hot_button_ = hot_button;
   if (hot_button) {
     hot_button->SetHotTracked(true);
     hot_button->NotifyAccessibilityEvent(ui::AX_EVENT_SELECTION, true);
   }
 }
 
 }  // namespace views