Drag-and-drop: Target drag messages (the sequel).

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 86257b48c45cb766d5dd5f20f7056b88c1bc4b9d..2fe38c4340826493e1a4ed517b2cecf700a443d2 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -80,6 +80,7 @@
 #include "content/browser/webui/web_ui_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/frame_messages.h"
 #include "content/common/input_messages.h"
 #include "content/common/page_messages.h"
@@ -2963,10 +2964,16 @@ void WebContentsImpl::DragSourceEndedAt(int client_x,
                                         int client_y,
                                         int screen_x,
                                         int screen_y,
-                                        blink::WebDragOperation operation) {
+                                        blink::WebDragOperation operation,
+                                        RenderWidgetHost* source_rwh) {
   if (browser_plugin_embedder_.get())
     browser_plugin_embedder_->DragSourceEndedAt(
         client_x, client_y, screen_x, screen_y, operation);
+  if (GetRenderViewHost()) {

[dcheng, 2016/11/17 19:59:01]

Should this check source_rwh instead?

(My recollection is that this null check is required since a window can close
itself during drag)

[paulmeyer, 2016/11/17 20:46:43]

I thought about that. It was always GetRenderViewHost() before, but it does make
more sense to check |source_rwh| now. Done.

+    source_rwh->DragSourceEndedAt(gfx::Point(client_x, client_y),
+                                  gfx::Point(screen_x, screen_y),
+                                  operation);
+  }
 }
 
 void WebContentsImpl::LoadStateChanged(
@@ -3017,11 +3024,9 @@ void WebContentsImpl::NotifyWebContentsFocused() {
     observer.OnWebContentsFocused();
 }
 
-void WebContentsImpl::SystemDragEnded() {
-  // TODO(paulmeyer): This will need to target the correct specific RWH to work
-  // with OOPIF.
+void WebContentsImpl::SystemDragEnded(RenderWidgetHost* source_rwh) {
   if (GetRenderViewHost())

[dcheng, 2016/11/17 19:59:01]

Ditto.

[paulmeyer, 2016/11/17 20:46:43]

Ditto done.

-    GetRenderViewHost()->GetWidget()->DragSourceSystemDragEnded();
+    source_rwh->DragSourceSystemDragEnded();
   if (browser_plugin_embedder_.get())
     browser_plugin_embedder_->SystemDragEnded();
 }