Fixed drag and drop into and out of Browser Plugin.

content/browser/browser_plugin/browser_plugin_embedder.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_embedder.h"
 
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_guest_manager.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin/browser_plugin_constants.h"
 #include "content/common/browser_plugin/browser_plugin_messages.h"
+#include "content/common/drag_messages.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/escape.h"
 
 namespace content {
 
@@ skipping 10 matching lines @@
 }
 
 // static
 BrowserPluginEmbedder* BrowserPluginEmbedder::Create(
     WebContentsImpl* web_contents) {
   if (factory_)
     return factory_->CreateBrowserPluginEmbedder(web_contents);
   return new BrowserPluginEmbedder(web_contents);
 }
 
+void BrowserPluginEmbedder::DragEnteredGuest(BrowserPluginGuest* guest) {
+  guest_dragging_over_ = guest->AsWeakPtr();
+}
+
+void BrowserPluginEmbedder::DragLeftGuest(BrowserPluginGuest* guest) {
+  // Avoid race conditions in switching between guests being hovered over by
+  // only un-setting if the caller is marked as the guest being dragged over.
+  if (guest_dragging_over_ == guest) {
+    guest_dragging_over_.reset();
+  }
+}
+
+void BrowserPluginEmbedder::StartDrag(BrowserPluginGuest* guest) {
+  guest_started_drag_ = guest->AsWeakPtr();
+}
+
+void BrowserPluginEmbedder::StopDrag(BrowserPluginGuest* guest) {
+  if (guest_started_drag_ == guest) {
+    guest_started_drag_.reset();
+  }
+}
+
 void BrowserPluginEmbedder::GetRenderViewHostAtPosition(
     int x, int y, const WebContents::GetRenderViewHostCallback& callback) {
   // Store the callback so we can call it later when we have the response.
   pending_get_render_view_callbacks_.insert(
       std::make_pair(next_get_render_view_request_id_, callback));
   Send(new BrowserPluginMsg_PluginAtPositionRequest(
       routing_id(),
       next_get_render_view_request_id_,
       gfx::Point(x, y)));
   ++next_get_render_view_request_id_;
 }
 
 void BrowserPluginEmbedder::RenderViewGone(base::TerminationStatus status) {
   CleanUp();
 }
 
 bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(BrowserPluginEmbedder, message)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_AllocateInstanceID,
                         OnAllocateInstanceID)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_Attach, OnAttach)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_CreateGuest, OnCreateGuest)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_PluginAtPositionResponse,
                         OnPluginAtPositionResponse)
+    IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_UpdateDragCursor,
+                                OnUpdateDragCursor(&handled));
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+void BrowserPluginEmbedder::DragSourceEndedAt(int client_x, int client_y,
+    int screen_x, int screen_y, WebKit::WebDragOperation operation) {

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

Hmm, is client_x, client_y in the right coordinate system?

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

Good catch, doesn't seem to change much (if anything) in linux though.

+  if (guest_started_drag_)

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

Put in block:

if (guest_started_drag_) {
  guest_started_drag_->DragSourceEndedAt(client_x, client_y,
      screen_x, screen_y, operation);
}

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

Done.

+      guest_started_drag_->DragSourceEndedAt(client_x, client_y,
+          screen_x, screen_y, operation);
+}
+
+void BrowserPluginEmbedder::DragSourceMovedTo(int client_x, int client_y,

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

ditto

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

Done.

+                                              int screen_x, int screen_y) {
+  if (guest_started_drag_)
+      guest_started_drag_->DragSourceMovedTo(client_x, client_y,

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

{
...
}

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

Done.

+                                             screen_x, screen_y);
+}
+
+void BrowserPluginEmbedder::SystemDragEnded() {
+  if (guest_started_drag_ && (guest_started_drag_ != guest_dragging_over_))
+    guest_started_drag_->EndSystemDrag();
+  guest_started_drag_.reset();
+  guest_dragging_over_.reset();
+}
+
+void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) {
+  *handled = (guest_dragging_over_ != NULL);
+}
+
 void BrowserPluginEmbedder::CleanUp() {
   // CleanUp gets called when BrowserPluginEmbedder's WebContents goes away
   // or the associated RenderViewHost is destroyed or swapped out. Therefore we
   // don't need to care about the pending callbacks anymore.
   pending_get_render_view_callbacks_.clear();
 }
 
 BrowserPluginGuestManager*
     BrowserPluginEmbedder::GetBrowserPluginGuestManager() {
   BrowserPluginGuestManager* guest_manager = static_cast<WebContentsImpl*>(
@@ skipping 45 matching lines @@
   if (guest)
     render_view_host = guest->GetWebContents()->GetRenderViewHost();
   else  // No plugin, use embedder's RenderViewHost.
     render_view_host = web_contents()->GetRenderViewHost();
 
   callback_iter->second.Run(render_view_host, position.x(), position.y());
   pending_get_render_view_callbacks_.erase(callback_iter);
 }
 
 }  // namespace content