Add WebDragData to blink::WebView::dragtargetDrop

content/browser/renderer_host/render_view_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_view_host_impl.h"
 
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 577 matching lines @@
   GetWidget()->RendererExited(status, exit_code);
   delegate_->RenderViewTerminated(this, status, exit_code);
 }
 
 void RenderViewHostImpl::DragTargetDragEnter(
     const DropData& drop_data,
     const gfx::Point& client_pt,
     const gfx::Point& screen_pt,
     WebDragOperationsMask operations_allowed,
     int key_modifiers) {
+  DCHECK(drop_data.is_valid);
   const int renderer_id = GetProcess()->GetID();
   ChildProcessSecurityPolicyImpl* policy =
       ChildProcessSecurityPolicyImpl::GetInstance();
 
 #if defined(OS_CHROMEOS)
   // The externalfile:// scheme is used in Chrome OS to open external files in a
   // browser tab.
   if (drop_data.url.SchemeIs(content::kExternalFileScheme))
     policy->GrantRequestURL(renderer_id, drop_data.url);
 #endif
@@ skipping 89 matching lines @@
   const gfx::Point client_pt_in_viewport = ConvertDIPToViewport(client_pt);
   Send(new DragMsg_TargetDragOver(GetRoutingID(), client_pt_in_viewport,
                                   screen_pt, operations_allowed,
                                   key_modifiers));
 }
 
 void RenderViewHostImpl::DragTargetDragLeave() {
   Send(new DragMsg_TargetDragLeave(GetRoutingID()));
 }
 
-void RenderViewHostImpl::DragTargetDrop(
-    const gfx::Point& client_pt,
-    const gfx::Point& screen_pt,
-    int key_modifiers) {
+void RenderViewHostImpl::DragTargetDrop(const DropData& drop_data,
+                                        const gfx::Point& client_pt,
+                                        const gfx::Point& screen_pt,
+                                        int key_modifiers) {
   const gfx::Point client_pt_in_viewport = ConvertDIPToViewport(client_pt);
-  Send(new DragMsg_TargetDrop(GetRoutingID(), client_pt_in_viewport, screen_pt,
-                              key_modifiers));
+  // TODO(hush): filter the drop_data if drop data is valid.

[no sievers, 2016/03/08 01:22:15]

nit: This comment's meaning is not evident.

[dcheng, 2016/03/08 01:44:08]

Can we just extract the logic from DragTargetEnter into a helper and call it
here as well? That'll save the TODO, and it'll prevent us from missing this
later when Android plumbs it through here.

[hush (inactive), 2016/03/08 18:23:06]

I've done it in a follow up CL that builds on top of this one.
https://codereview.chromium.org/1728193002/

I try to make this CL related to the API plumbing only (while maintaining
correctness)

+  Send(new DragMsg_TargetDrop(GetRoutingID(), drop_data, client_pt_in_viewport,
+                              screen_pt, key_modifiers));
 }
 
 void RenderViewHostImpl::DragSourceEndedAt(
     int client_x, int client_y, int screen_x, int screen_y,
     WebDragOperation operation) {
   const gfx::Point client_pt_in_viewport =
       ConvertDIPToViewport(gfx::Point(client_x, client_y));
   Send(new DragMsg_SourceEnded(GetRoutingID(), client_pt_in_viewport,
                                gfx::Point(screen_x, screen_y), operation));
 }
@@ skipping 646 matching lines @@
 
 gfx::Point RenderViewHostImpl::ConvertDIPToViewport(const gfx::Point& point) {
   // The point in guest view is already converted.
   if (!render_widget_host_->scale_input_to_viewport())
     return point;
   float scale = GetWidget()->GetView()->current_device_scale_factor();
   return gfx::Point(point.x() * scale, point.y() * scale);
 }
 
 }  // namespace content