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

content/browser/web_contents/web_contents_view_aura.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/web_contents/web_contents_view_aura.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/auto_reset.h"
@@ skipping 544 matching lines @@
     return;
 
   aura::Window* window = GetContentNativeView();
   gfx::Point screen_loc = display::Screen::GetScreen()->GetCursorScreenPoint();
   gfx::Point client_loc = screen_loc;
   aura::client::ScreenPositionClient* screen_position_client =
       aura::client::GetScreenPositionClient(window->GetRootWindow());
   if (screen_position_client)
     screen_position_client->ConvertPointFromScreen(window, &client_loc);
 
-  if (!drag_start_rwh_)
-    return;
-
-  if (drag_start_rwh_.get() ==
-      web_contents_->GetRenderViewHost()->GetWidget()) {
+  if (drag_start_rwh_) {

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

Let's centralize the null checks in WebContents, per the previous suggestions.

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

Done.

+    // TODO(paulmeyer): In the OOPIF case, should |client_loc| be converted to
+    // the coordinates local to |drag_start_rwh_|? See crbug.com/647249.
     web_contents_->DragSourceEndedAt(client_loc.x(), client_loc.x(),
-                                     screen_loc.x(), screen_loc.y(), ops);
+                                     screen_loc.x(), screen_loc.y(), ops,
+                                     drag_start_rwh_.get());
   }
-
-  // TODO(paulmeyer): In the OOPIF case, should |client_loc| be converted to the
-  // coordinates local to |drag_start_rwh_|? See crbug.com/647249.
-  drag_start_rwh_->DragSourceEndedAt(client_loc, screen_loc, ops);
 }
 
 void WebContentsViewAura::InstallOverscrollControllerDelegate(
     RenderWidgetHostViewAura* view) {
   const std::string value = base::CommandLine::ForCurrentProcess()->
       GetSwitchValueASCII(switches::kOverscrollHistoryNavigation);
   if (value == "0") {
     navigation_overlay_.reset();
     return;
   }
@@ skipping 300 matching lines @@
 
 void WebContentsViewAura::StartDragging(
     const DropData& drop_data,
     blink::WebDragOperationsMask operations,
     const gfx::ImageSkia& image,
     const gfx::Vector2d& image_offset,
     const DragEventSourceInfo& event_info,
     RenderWidgetHostImpl* source_rwh) {
   aura::Window* root_window = GetNativeView()->GetRootWindow();
   if (!aura::client::GetDragDropClient(root_window)) {
-    web_contents_->SystemDragEnded();
+    web_contents_->SystemDragEnded(source_rwh);
     return;
   }
 
   drag_start_rwh_ = source_rwh->GetWeakPtr();
 
   ui::TouchSelectionController* selection_controller = GetSelectionController();
   if (selection_controller)
     selection_controller->HideAndDisallowShowingAutomatically();
   std::unique_ptr<ui::OSExchangeData::Provider> provider =
       ui::OSExchangeDataProviderFactory::CreateProvider();
@@ skipping 28 matching lines @@
   // not safe to access any class members in this case since |this| may already
   // be destroyed. The local variable |drag_source| will still be valid though,
   // so we can use it to determine if the window is gone.
   if (!drag_source->window()) {
     // Note that in this case, we don't need to call SystemDragEnded() since the
     // renderer is going away.
     return;
   }
 
   EndDrag(ConvertToWeb(result_op));
-  web_contents_->SystemDragEnded();
+  web_contents_->SystemDragEnded(source_rwh);
 }
 
 void WebContentsViewAura::UpdateDragCursor(blink::WebDragOperation operation) {
   current_drag_op_ = operation;
 }
 
 void WebContentsViewAura::GotFocus() {
   web_contents_->NotifyWebContentsFocused();
 }
 
@@ skipping 292 matching lines @@
                                         bool allow_multiple_selection) {
   NOTIMPLEMENTED() << " show " << items.size() << " menu items";
 }
 
 void WebContentsViewAura::HidePopupMenu() {
   NOTIMPLEMENTED();
 }
 #endif
 
 }  // namespace content