Fixed drag and drop into and out of Browser Plugin.

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 <algorithm>
 
+#include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/browser_plugin/browser_plugin_embedder.h"
 #include "content/browser/browser_plugin/browser_plugin_guest_helper.h"
 #include "content/browser/browser_plugin/browser_plugin_guest_manager.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/browser/web_contents/web_contents_view_guest.h"
 #include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
 #include "content/common/content_constants_internal.h"
 #include "content/common/drag_messages.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
 #include "content/port/browser/render_view_host_delegate_view.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/geolocation_permission_context.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/browser/web_contents_view.h"
+#include "content/public/common/content_switches.h"
 #include "content/public/common/media_stream_request.h"
 #include "content/public/common/result_codes.h"
 #include "net/base/net_errors.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCursorInfo.h"
 #include "ui/surface/transport_dib.h"
 #include "webkit/glue/resource_type.h"
 #include "webkit/glue/webdropdata.h"
 
 #if defined(OS_MACOSX)
 #include "content/browser/browser_plugin/browser_plugin_popup_menu_helper_mac.h"
@@ skipping 431 matching lines @@
 
 void BrowserPluginGuest::SendMessageToEmbedder(IPC::Message* msg) {
   if (!attached()) {
     delete msg;
     return;
   }
   msg->set_routing_id(embedder_web_contents_->GetRoutingID());
   embedder_web_contents_->Send(msg);
 }
 
+void BrowserPluginGuest::DragSourceEndedAt(int client_x, int client_y,
+    int screen_x, int screen_y, WebKit::WebDragOperation operation) {
+  web_contents()->GetRenderViewHost()->DragSourceEndedAt(client_x, client_y,
+      screen_x, screen_y, operation);
+}
+
+void BrowserPluginGuest::DragSourceMovedTo(int client_x, int client_y,
+                                           int screen_x, int screen_y) {
+  web_contents()->GetRenderViewHost()->DragSourceMovedTo(client_x, client_y,
+                                                         screen_x, screen_y);
+}
+
+void BrowserPluginGuest::EndSystemDrag() {
+  web_contents()->GetRenderViewHost()->DragSourceSystemDragEnded();

[Fady Samuel, 2013/04/09 20:49:12]

This ought to fix the sticky selection problem:

void BrowserPluginGuest::EndSystemDrag() {
  RenderViewHostImpl* guest_rvh = static_cast<RenderViewHostImpl*>(
      GetWebContents()->GetRenderViewHost());
  guest_rvh->DragSourceSystemDragEnded();
  // Issue a MouseUp event to get out of a selection state.
  WebKit::WebMouseEvent mouse_event;
  mouse_event.type = WebKit::WebInputEvent::MouseUp;
  mouse_event.button = WebKit::WebMouseEvent::ButtonLeft;
  guest_rvh->ForwardMouseEvent(mouse_event);
}

[mthiesse, 2013/04/18 18:02:03]

Done. Thanks.

+}
+
 void BrowserPluginGuest::LoadRedirect(
     const GURL& old_url,
     const GURL& new_url,
     bool is_top_level) {
   SendMessageToEmbedder(
       new BrowserPluginMsg_LoadRedirect(instance_id(),
                                         old_url,
                                         new_url,
                                         is_top_level));
 }
@@ skipping 52 matching lines @@
   params.current_entry_index =
       GetWebContents()->GetController().GetCurrentEntryIndex();
   params.entry_count =
       GetWebContents()->GetController().GetEntryCount();
   SendMessageToEmbedder(
       new BrowserPluginMsg_LoadCommit(instance_id(), params));
   RecordAction(UserMetricsAction("BrowserPlugin.Guest.DidNavigate"));
 }
 
 void BrowserPluginGuest::DidStopLoading(RenderViewHost* render_view_host) {
-  // Initiating a drag from inside a guest is currently not supported. So inject
-  // some JS to disable it. http://crbug.com/161112
-  const char script[] = "window.addEventListener('dragstart', function() { "
-                        "  window.event.preventDefault(); "
-                        "});";
-  render_view_host->ExecuteJavascriptInWebFrame(string16(),
-                                                ASCIIToUTF16(script));
+  bool disable_dragdrop = true;
+#if (defined(OS_LINUX))
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+        switches::kEnableBrowserPluginDragDrop))
+    disable_dragdrop = false;
+#endif  // (defined(OS_LINUX))
+  if (disable_dragdrop) {
+    // Initiating a drag from inside a guest is currently not supported without
+    // the kEnableBrowserPluginGuestViews flag. So inject some JS to disable

[Fady Samuel, 2013/04/09 20:49:12]

Stale comment.

[mthiesse, 2013/04/18 18:02:03]

Done.

+    // it. http://crbug.com/161112
+    const char script[] = "window.addEventListener('dragstart', function() { "
+                          "  window.event.preventDefault(); "
+                          "});";
+    render_view_host->ExecuteJavascriptInWebFrame(string16(),
+                                                  ASCIIToUTF16(script));
+  }
   SendMessageToEmbedder(new BrowserPluginMsg_LoadStop(instance_id()));
 }
 
 void BrowserPluginGuest::RenderViewReady() {
   // TODO(fsamuel): Investigate whether it's possible to update state earlier
   // here (see http://crbug.com/158151).
   Send(new ViewMsg_SetFocus(routing_id(), focused_));
   UpdateVisibility();
   RenderViewHost* rvh = GetWebContents()->GetRenderViewHost();
   if (auto_size_enabled_)
@@ skipping 77 matching lines @@
     IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnLockMouse)
     IPC_MESSAGE_HANDLER(ViewHostMsg_SetCursor, OnSetCursor)
  #if defined(OS_MACOSX)
     // MacOSX creates and populates platform-specific select drop-down menus
     // whereas other platforms merely create a popup window that the guest
     // renderer process paints inside.
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowPopup, OnShowPopup)
  #endif
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowView, OnShowView)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget)
+    IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_StartDragging,
+                                OnStartDragging(&handled));
     IPC_MESSAGE_HANDLER(ViewHostMsg_TakeFocus, OnTakeFocus)
+    IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_TargetDrop_ACK,
+                                OnTargetDrop_ACK(&handled));
     IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnUnlockMouse)
-    IPC_MESSAGE_HANDLER(DragHostMsg_UpdateDragCursor, OnUpdateDragCursor)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateFrameName, OnUpdateFrameName)
     IPC_MESSAGE_HANDLER(ViewHostMsg_UpdateRect, OnUpdateRect)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void BrowserPluginGuest::Attach(
     WebContentsImpl* embedder_web_contents,
     BrowserPluginHostMsg_CreateGuest_Params params) {
@@ skipping 44 matching lines @@
 }
 
 void BrowserPluginGuest::OnDragStatusUpdate(int instance_id,
                                             WebKit::WebDragStatus drag_status,
                                             const WebDropData& drop_data,
                                             WebKit::WebDragOperationsMask mask,
                                             const gfx::Point& location) {
   RenderViewHost* host = GetWebContents()->GetRenderViewHost();
   switch (drag_status) {
     case WebKit::WebDragStatusEnter:
+      embedder_web_contents_->GetBrowserPluginEmbedder()->DragEnteredGuest(
+          this);
       host->DragTargetDragEnter(drop_data, location, location, mask, 0);
       break;
     case WebKit::WebDragStatusOver:
       host->DragTargetDragOver(location, location, mask, 0);
       break;
     case WebKit::WebDragStatusLeave:
+      embedder_web_contents_->GetBrowserPluginEmbedder()->DragLeftGuest(this);
       host->DragTargetDragLeave();
       break;
     case WebKit::WebDragStatusDrop:
       host->DragTargetDrop(location, location, 0);
+      host->DragSourceSystemDragEnded();

[Fady Samuel, 2013/04/09 20:49:12]

EndSystemDrag();

[mthiesse, 2013/04/18 18:02:03]

Done.

       break;
     case WebKit::WebDragStatusUnknown:
       NOTREACHED();
   }
 }
 
 void BrowserPluginGuest::OnGo(int instance_id, int relative_index) {
   GetWebContents()->GetController().GoToOffset(relative_index);
 }
 
@@ skipping 293 matching lines @@
       web_contents, disposition, initial_bounds, user_gesture);
 }
 
 void BrowserPluginGuest::OnShowWidget(int route_id,
                                       const gfx::Rect& initial_pos) {
   gfx::Rect screen_pos(initial_pos);
   screen_pos.Offset(guest_screen_rect_.OffsetFromOrigin());
   GetWebContents()->ShowCreatedWidget(route_id, screen_pos);
 }
 
+void BrowserPluginGuest::OnStartDragging(bool* handled) {
+  embedder_web_contents_->GetBrowserPluginEmbedder()->StartDrag(this);

[Fady Samuel, 2013/04/09 20:49:12]

Why not just move this to WebContentsViewGuest::StartDragging  to avoid this
method all together?

[mthiesse, 2013/04/18 18:02:03]

Done.

+  // Don't mark as handled, so that the message gets routed to
+  // RenderViewHostImpl::OnStartDragging, which in turn calls
+  // WebContentsViewGuest::StartDragging, which starts the drag on the embedder.
+  *handled = false;
+}
+
 void BrowserPluginGuest::OnTakeFocus(bool reverse) {
   SendMessageToEmbedder(
       new BrowserPluginMsg_AdvanceFocus(instance_id(), reverse));
 }
 
-void BrowserPluginGuest::OnUpdateDragCursor(
-    WebKit::WebDragOperation operation) {
-  RenderViewHostImpl* embedder_render_view_host =
-      static_cast<RenderViewHostImpl*>(
-          embedder_web_contents_->GetRenderViewHost());
-  CHECK(embedder_render_view_host);
-  RenderViewHostDelegateView* view =
-      embedder_render_view_host->GetDelegate()->GetDelegateView();
-  if (view)
-    view->UpdateDragCursor(operation);
+void BrowserPluginGuest::OnTargetDrop_ACK(bool* handled) {
+  EndSystemDrag();
+  // Don't mark as handled.

[Fady Samuel, 2013/04/09 20:49:12]

This comment on its own is not very useful. Please explain why we do this?

Actually it seems like we either need to call EndSystemDrag() here or
host->DragSourceSystemDragEnded(); in BrowserPluginGuest::OnDragStatusUpdate?

Do we need both? If not, maybe we simply get rid of this one and leave the
other? I'm not sure.

[mthiesse, 2013/04/18 18:02:03]

Ah, meant to clean this up, was part of my experiments to fix drag and drop on
windows.

+  *handled = false;
 }
 
 void BrowserPluginGuest::OnUpdateFrameName(int frame_id,
                                            bool is_top_level,
                                            const std::string& name) {
   if (!is_top_level)
     return;
 
   name_ = name;
   SendMessageToEmbedder(new BrowserPluginMsg_UpdatedName(instance_id_, name));
@@ skipping 151 matching lines @@
     LOG(INFO) << "Guest not found. Instance ID: " << instance_id;
     return;
   }
   if (!should_allow)
     guest->Destroy();
   // If we do not destroy the guest then we allow the new window.
   new_window_request_map_.erase(new_window_request_iter);
 }
 
 }  // namespace content