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) {
+  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_.get() == guest) {
+    guest_dragging_over_.reset();
+  }
+}
+
+void BrowserPluginEmbedder::StartDrag(BrowserPluginGuest* guest) {
+  guest_started_drag_ = guest->AsWeakPtr();
+}
+
 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 35 matching lines @@
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_AllocateInstanceID,
                         OnAllocateInstanceID)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_CreateGuest,
                         OnCreateGuest)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_PluginAtPositionResponse,
                         OnPluginAtPositionResponse)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_PluginDestroyed,
                         OnPluginDestroyed)
     IPC_MESSAGE_HANDLER(BrowserPluginHostMsg_BuffersSwappedACK,
                         OnSwapBuffersACK)
+    IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_UpdateDragCursor,
+                                OnUpdateDragCursor(&handled));
+    IPC_MESSAGE_HANDLER_GENERIC(DragHostMsg_DragStopped,
+                                OnDragStopped(message, &handled));
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
+void BrowserPluginEmbedder::OnDragStopped(const IPC::Message& message,
+    bool* handled) {
+  if (guest_started_drag_.get())
+    *handled = guest_started_drag_->OnMessageReceived(message);
+}
+
+void BrowserPluginEmbedder::OnUpdateDragCursor(bool* handled) {
+  *handled = guest_dragging_over_.get();
+}
+
 void BrowserPluginEmbedder::Observe(int type,
                                     const NotificationSource& source,
                                     const NotificationDetails& details) {
   switch (type) {
     case NOTIFICATION_WEB_CONTENTS_VISIBILITY_CHANGED: {
       bool visible = *Details<bool>(details).ptr();
       WebContentsVisibilityChanged(visible);
       break;
     }
     default:
@@ skipping 97 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