Drag-and-drop: Target drag messages to specific RenderWidgets.

content/browser/renderer_host/render_widget_host_impl.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 "content/browser/renderer_host/render_widget_host_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 1361 matching lines @@
                                           const gfx::Point& client_pt,
                                           const gfx::Point& screen_pt,
                                           int key_modifiers) {
   DropData drop_data_with_permissions(drop_data);
   GrantFileAccessFromDropData(&drop_data_with_permissions);
   Send(new DragMsg_TargetDrop(GetRoutingID(), drop_data_with_permissions,
                               client_pt, screen_pt, key_modifiers));
 }
 
 void RenderWidgetHostImpl::DragSourceEndedAt(
-    int client_x, int client_y, int screen_x, int screen_y,
+    const gfx::Point& client_pt,
+    const gfx::Point& screen_pt,
     blink::WebDragOperation operation) {
   Send(new DragMsg_SourceEnded(GetRoutingID(),
-                               gfx::Point(client_x, client_y),
-                               gfx::Point(screen_x, screen_y),
+                               client_pt,
+                               screen_pt,
                                operation));
 }
 
 void RenderWidgetHostImpl::DragSourceSystemDragEnded() {
   Send(new DragMsg_SourceSystemDragEnded(GetRoutingID()));
 }
 
 void RenderWidgetHostImpl::FilterDropData(DropData* drop_data) {
 #if DCHECK_IS_ON()
   drop_data->view_id = GetRoutingID();
@@ skipping 72 matching lines @@
   if (view_)
     view_->SetNeedsBeginFrames(needs_begin_frames);
 }
 
 void RenderWidgetHostImpl::OnStartDragging(
     const DropData& drop_data,
     blink::WebDragOperationsMask drag_operations_mask,
     const SkBitmap& bitmap,
     const gfx::Vector2d& bitmap_offset_in_dip,
     const DragEventSourceInfo& event_info) {
-  // TODO(paulmeyer): Stop relying on RenderViewHost once
-  // DragSourceSystemDragEnded is moved into RenderWidgetHost. See
-  // crbug.com/647249.
-  RenderViewHost* rvh = RenderViewHost::From(this);
-  if (!rvh)
-    return;
-
   RenderViewHostDelegateView* view = delegate_->GetDelegateView();
   if (!view) {
     // Need to clear drag and drop state in blink.
     DragSourceSystemDragEnded();
     return;
   }
 
   DropData filtered_data(drop_data);
   RenderProcessHost* process = GetProcess();
   ChildProcessSecurityPolicyImpl* policy =
@@ skipping 23 matching lines @@
   for (size_t i = 0; i < drop_data.file_system_files.size(); ++i) {
     storage::FileSystemURL file_system_url =
         file_system_context->CrackURL(drop_data.file_system_files[i].url);
     if (policy->CanReadFileSystemFile(GetProcess()->GetID(), file_system_url))
       filtered_data.file_system_files.push_back(drop_data.file_system_files[i]);
   }
 
   float scale = GetScaleFactorForView(GetView());
   gfx::ImageSkia image(gfx::ImageSkiaRep(bitmap, scale));
   view->StartDragging(filtered_data, drag_operations_mask, image,
-                      bitmap_offset_in_dip, event_info);
+                      bitmap_offset_in_dip, event_info, this);
 }
 
 void RenderWidgetHostImpl::OnUpdateDragCursor(WebDragOperation current_op) {
   if (delegate_ && delegate_->OnUpdateDragCursor())
     return;
 
   RenderViewHostDelegateView* view = delegate_->GetDelegateView();
   if (view)
     view->UpdateDragCursor(current_op);
 }
@@ skipping 949 matching lines @@
     // Note: We are using the origin URL provided by the sender here. It may be
     // different from the receiver's.
     file_system_file.url =
         GURL(storage::GetIsolatedFileSystemRootURIString(
                  file_system_url.origin(), filesystem_id, std::string())
                  .append(register_name));
   }
 }
 
 }  // namespace content