Add WebDragData to blink::WebView::dragtargetDrop

content/browser/browser_plugin/browser_plugin_guest.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/browser_plugin/browser_plugin_guest.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 24 matching lines @@
 #include "content/common/drag_messages.h"
 #include "content/common/host_shared_bitmap_manager.h"
 #include "content/common/input_messages.h"
 #include "content/common/site_isolation_policy.h"
 #include "content/common/text_input_state.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_plugin_guest_manager.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/guest_host.h"
+#include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/common/browser_plugin_guest_mode.h"
 #include "content/public/common/drop_data.h"
 #include "ui/gfx/geometry/size_conversions.h"
 
 #if defined(OS_MACOSX)
 #include "content/browser/browser_plugin/browser_plugin_popup_menu_helper_mac.h"
 #include "content/common/frame_messages.h"
@@ skipping 737 matching lines @@
   delegate_->DidDetach();
 }
 
 void BrowserPluginGuest::OnDragStatusUpdate(int browser_plugin_instance_id,
                                             blink::WebDragStatus drag_status,
                                             const DropData& drop_data,
                                             blink::WebDragOperationsMask mask,
                                             const gfx::Point& location) {
   RenderViewHost* host = GetWebContents()->GetRenderViewHost();
   auto embedder = owner_web_contents_->GetBrowserPluginEmbedder();
+  DropData filtered_data(drop_data);
+  host->FilterDropData(&filtered_data);
   switch (drag_status) {
     case blink::WebDragStatusEnter:
-      // Only track the URL being dragged over the guest if the link isn't
-      // coming from the guest.
-      if (!embedder->DragEnteredGuest(this))
-        dragged_url_ = drop_data.url;
-      host->DragTargetDragEnter(drop_data, location, location, mask,
+      host->DragTargetDragEnter(filtered_data, location, location, mask,
                                 drop_data.key_modifiers);
       break;
     case blink::WebDragStatusOver:
       host->DragTargetDragOver(location, location, mask,
                                drop_data.key_modifiers);
       break;
     case blink::WebDragStatusLeave:
       embedder->DragLeftGuest(this);
       host->DragTargetDragLeave();
       break;
     case blink::WebDragStatusDrop:
-      host->DragTargetDrop(location, location, drop_data.key_modifiers);
+      // Only track the URL being dragged over the guest if the link isn't
+      // coming from the guest.
+      if (!embedder->DragEnteredGuest(this))

[lazyboy, 2016/05/31 22:21:22]

Hmm, this doesn't seem quite right, at this point DragEnteredGuest should always
return true (i.e. the condition of this if won't be true).

We want to call DidDropLink below if this drag came from anywhere other than
us/this.
So instead of remembering the dragged_url_, we want to remember a bool if
WebDragStatusEnter was initiated by us or not.

This one can be tested by looking at crbug 460757 and checking whether link
dropping in chrome://chrome-signin works correctly.

[hush (inactive), 2016/06/04 01:41:45]

Right. I found link dropping in chrome://chrome-signin navigates with my patch
here. I fixed in the last version. Thanks!

+        dragged_url_ = drop_data.url;

[lfg, 2016/05/31 21:30:42]

Do we still need dragged_url_ as a member?

[hush (inactive), 2016/06/04 01:41:45]

No. I will remove it in the next patch set.

+
+      host->DragTargetDrop(filtered_data, location, location,
+                           drop_data.key_modifiers);
       if (dragged_url_.is_valid()) {
         delegate_->DidDropLink(dragged_url_);
         dragged_url_ = GURL();
       }
       break;
     case blink::WebDragStatusUnknown:
       NOTREACHED();
   }
   last_drag_status_ = drag_status;
   EndSystemDragIfApplicable();
@@ skipping 176 matching lines @@
           range, character_bounds);
 }
 #endif
 
 void BrowserPluginGuest::SetContextMenuPosition(const gfx::Point& position) {
   if (delegate_)
     delegate_->SetContextMenuPosition(position);
 }
 
 }  // namespace content