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 "base/command_line.h"
 #include "base/stl_util.h"
 #include "content/browser/browser_plugin/browser_plugin_guest.h"
 #include "content/browser/browser_plugin/browser_plugin_host_factory.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/browser_plugin_messages.h"
+#include "content/common/drag_messages.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.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"
@@ skipping 164 matching lines @@
 
 BrowserPluginGuest* BrowserPluginEmbedder::GetGuestByInstanceID(
     int instance_id) const {
   ContainerInstanceMap::const_iterator it =
       guest_web_contents_by_instance_id_.find(instance_id);
   if (it != guest_web_contents_by_instance_id_.end())
     return static_cast<WebContentsImpl*>(it->second)->GetBrowserPluginGuest();
   return NULL;
 }
 
+void BrowserPluginEmbedder::DragEnteredGuest(BrowserPluginGuest* guest) {

[Fady Samuel, 2013/02/01 16:59:53]

SetDragEnteredGuest I'm a bit concerned about lifetime issues (what if we
attempt to remove a BrowserPlugin as we're dragging). Maybe we should
have a weak pointer to BrowserPluginGuest?

[mthiesse, 2013/02/07 15:28:55]

Done.

+  guest_dragging_over = guest;
+}
+
+void BrowserPluginEmbedder::DragLeftGuest(BrowserPluginGuest* guest) {

[Fady Samuel, 2013/02/01 16:59:53]

SetDragLeftGuest. I'm a bit concerned about lifetime issues. Maybe we should
have a weak pointer to BrowserPluginGuest?

[mthiesse, 2013/02/07 15:28:55]

Done.

+  // 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 = NULL;
+  }
+}
+
+void BrowserPluginEmbedder::StartDrag(BrowserPluginGuest* guest) {
+  guest_started_drag = guest;
+}
+
 void BrowserPluginEmbedder::DestroyGuestByInstanceID(int instance_id) {
   BrowserPluginGuest* guest = GetGuestByInstanceID(instance_id);
   if (guest) {
     WebContents* guest_web_contents = guest->GetWebContents();
 
     // Destroy the guest's web_contents.
     delete guest_web_contents;
     guest_web_contents_by_instance_id_.erase(instance_id);
   }
 }
@@ skipping 13 matching lines @@
 
 void BrowserPluginEmbedder::RenderViewDeleted(
     RenderViewHost* render_view_host) {
 }
 
 void BrowserPluginEmbedder::RenderViewGone(base::TerminationStatus status) {
   CleanUp();
 }
 
 bool BrowserPluginEmbedder::OnMessageReceived(const IPC::Message& message) {
+  if (message.type() == DragHostMsg_DragStopped::ID) {
+    if (guest_started_drag)

[Fady Samuel, 2013/02/01 16:59:53]

Please move this and UpdateDragCursor to separate message handlers so as to
avoid cluttering OnMessageReceived.

[mthiesse, 2013/02/07 15:28:55]

Done.

+      return guest_started_drag->OnMessageReceived(message);
+  }
+  if (message.type() == DragHostMsg_UpdateDragCursor::ID){
+    // If the guest is being dragged over we want to mark this as handled so
+    // that we don't update the cursor twice, once by the guest, and once by the
+    // embedder (and have the cursor flicker between droppable and
+    // non-droppable).
+    return (guest_dragging_over);
+  }
   if (ShouldForwardToBrowserPluginGuest(message)) {
     int instance_id = 0;
     // All allowed messages must have instance_id as their first parameter.
     PickleIterator iter(message);
     bool success = iter.ReadInt(&instance_id);
     DCHECK(success);
     BrowserPluginGuest* guest = GetGuestByInstanceID(instance_id);
     if (guest && guest->OnMessageReceivedFromEmbedder(message))
       return true;
   }
@@ skipping 124 matching lines @@
                                              uint32 sync_point) {
   AcceleratedSurfaceMsg_BufferPresented_Params ack_params;
   ack_params.mailbox_name = mailbox_name;
   ack_params.sync_point = sync_point;
   RenderWidgetHostImpl::AcknowledgeBufferPresent(route_id,
                                                  gpu_host_id,
                                                  ack_params);
 }
 
 }  // namespace content