Fixed drag and drop into and out of Browser Plugin.

content/browser/browser_plugin/browser_plugin_embedder.h

 // 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.
 
 // A BrowserPluginEmbedder handles messages coming from a BrowserPlugin's
 // embedder that are not directed at any particular existing guest process.
 // In the beginning, when a BrowserPlugin instance in the embedder renderer
 // process requests an initial navigation, the WebContents for that renderer
 // renderer creates a BrowserPluginEmbedder for itself. The
 // BrowserPluginEmbedder, in turn, forwards the requests to a
 // BrowserPluginGuestManager, which creates and manages the lifetime of the new
 // guest.
 
 #ifndef CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_
 #define CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_
 
 #include <map>
 
+#include "base/memory/weak_ptr.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
 
 struct BrowserPluginHostMsg_CreateGuest_Params;
 struct BrowserPluginHostMsg_ResizeGuest_Params;
 
 namespace gfx {
 class Point;
 }
 
 namespace content {
 
+class BrowserPluginGuest;
 class BrowserPluginGuestManager;
 class BrowserPluginHostFactory;
 class WebContentsImpl;
 
 class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver {
  public:
   virtual ~BrowserPluginEmbedder();
 
   static BrowserPluginEmbedder* Create(WebContentsImpl* web_contents);
 
   // Returns the RenderViewHost at a point (|x|, |y|) asynchronously via
   // |callback|. We need a roundtrip to renderer process to get this
   // information.
   void GetRenderViewHostAtPosition(
       int x,
       int y,
       const WebContents::GetRenderViewHostCallback& callback);
 
   // Overrides factory for testing. Default (NULL) value indicates regular
   // (non-test) environment.
   static void set_factory_for_testing(BrowserPluginHostFactory* factory) {
     factory_ = factory;
   }
 
   // WebContentsObserver implementation.
   virtual void RenderViewGone(base::TerminationStatus status) OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual void SystemDragEnded() OVERRIDE;
+
+  void DragSourceEndedAt(int client_x, int client_y, int screen_x,
+      int screen_y, WebKit::WebDragOperation operation);
+
+  void DragSourceMovedTo(int client_x, int client_y,
+                         int screen_x, int screen_y);
+
+  void OnUpdateDragCursor(bool* handled);
+
+  void DragEnteredGuest(BrowserPluginGuest* guest);
+
+  void DragLeftGuest(BrowserPluginGuest* guest);
+
+  void StartDrag(BrowserPluginGuest* guest);
+
+  void StopDrag(BrowserPluginGuest* guest);
 
  private:
   friend class TestBrowserPluginEmbedder;
 
   BrowserPluginEmbedder(WebContentsImpl* web_contents);
 
   void CleanUp();
 
   BrowserPluginGuestManager* GetBrowserPluginGuestManager();
 
@@ skipping 13 matching lines @@
 
   // Map that contains outstanding queries to |GetRenderViewHostAtPosition|.
   // We need a roundtrip to the renderer process to retrieve the answer,
   // so we store these callbacks until we hear back from the renderer.
   typedef std::map<int, WebContents::GetRenderViewHostCallback>
       GetRenderViewHostCallbackMap;
   GetRenderViewHostCallbackMap pending_get_render_view_callbacks_;
   // Next request id for BrowserPluginMsg_PluginAtPositionRequest query.
   int next_get_render_view_request_id_;
 
+  // Used to correctly update the cursor when dragging over a guest, and to
+  // handle a race condition when dropping onto the guest that started the drag
+  // (the race is that the dragend message arrives before the drop message so
+  // the drop never takes place).
+  // crbug.com/233571
+  base::WeakPtr<BrowserPluginGuest> guest_dragging_over_;
+
+  // Pointer to the guest that started the drag, used to forward necessary drag
+  // status messages to the correct guest.
+  base::WeakPtr<BrowserPluginGuest> guest_started_drag_;
+
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginEmbedder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_