Drag-and-drop: Move startDrag out of WebView/RenderView.

content/renderer/render_view_impl.cc

Index: content/renderer/render_view_impl.cc
diff --git a/content/renderer/render_view_impl.cc b/content/renderer/render_view_impl.cc
index d79eff8ca989a5ac115d5a3a10c66b4d103ad3a6..97c6fced736646d99a3b2f77787847561219ddb9 100644
--- a/content/renderer/render_view_impl.cc
+++ b/content/renderer/render_view_impl.cc
@@ -1273,19 +1273,17 @@ bool RenderViewImpl::DoesRenderWidgetHaveTouchEventHandlersAt(
 
 bool RenderViewImpl::RenderWidgetWillHandleGestureEvent(
     const blink::WebGestureEvent& event) {
-  possible_drag_event_info_.event_source =
-      ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH;
-  possible_drag_event_info_.event_location =
-      gfx::Point(event.globalX, event.globalY);
+  GetWidget()->set_possible_drag_event_info(
+      ui::DragDropTypes::DRAG_EVENT_SOURCE_TOUCH,
+      gfx::Point(event.globalX, event.globalY));
   return false;
 }
 
 bool RenderViewImpl::RenderWidgetWillHandleMouseEvent(
     const blink::WebMouseEvent& event) {
-  possible_drag_event_info_.event_source =
-      ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE;
-  possible_drag_event_info_.event_location =
-      gfx::Point(event.globalX, event.globalY);
+  GetWidget()->set_possible_drag_event_info(

[dcheng, 2016/11/03 21:22:52]

Does this still need to go through the RenderWidgetOwnerDelegate? Maybe this can
just all be moved into RenderWidget now?

[paulmeyer, 2016/11/04 19:01:18]

Done.

+      ui::DragDropTypes::DRAG_EVENT_SOURCE_MOUSE,
+      gfx::Point(event.globalX, event.globalY));
 
   // If the mouse is locked, only the current owner of the mouse lock can
   // process mouse events.
@@ -1822,21 +1820,6 @@ void RenderViewImpl::setKeyboardFocusURL(const WebURL& url) {
   UpdateTargetURL(focus_url_, mouse_over_url_);
 }
 
-void RenderViewImpl::startDragging(WebLocalFrame* frame,
-                                   const WebDragData& data,
-                                   WebDragOperationsMask mask,
-                                   const WebImage& image,
-                                   const WebPoint& webImageOffset) {
-  blink::WebRect offset_in_window(webImageOffset.x, webImageOffset.y, 0, 0);
-  ConvertViewportToWindowViaWidget(&offset_in_window);
-  DropData drop_data(DropDataBuilder::Build(data));
-  drop_data.referrer_policy = frame->document().referrerPolicy();
-  gfx::Vector2d imageOffset(offset_in_window.x, offset_in_window.y);
-  Send(new DragHostMsg_StartDragging(GetRoutingID(), drop_data, mask,
-                                     image.getSkBitmap(), imageOffset,
-                                     possible_drag_event_info_));
-}
-
 bool RenderViewImpl::acceptsLoadDrops() {
   return renderer_preferences_.can_accept_load_drops;
 }