Prevented connecting drag drop events to a SwappedOut RenderViewHost in WebContentsViewGtk

content/browser/web_contents/web_contents_view_gtk.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_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 
@@ skipping 205 matching lines @@
   g_signal_connect(content_view, "leave-notify-event",
                    G_CALLBACK(OnLeaveNotify), web_contents_);
   g_signal_connect(content_view, "motion-notify-event",
                    G_CALLBACK(OnMouseMove), web_contents_);
   g_signal_connect(content_view, "scroll-event",
                    G_CALLBACK(OnMouseScroll), web_contents_);
   gtk_widget_add_events(content_view, GDK_LEAVE_NOTIFY_MASK |
                         GDK_POINTER_MOTION_MASK);
   InsertIntoContentArea(content_view);
 
-  // Renderer target DnD.
-  drag_dest_.reset(new WebDragDestGtk(web_contents_, content_view));
+  // We don't want to change any state in this class for swapped out RVHs
+  // because they will not be visible at this time.

[Charlie Reis, 2013/02/27 20:01:44]

Great.  Please add:
It is important to update this state when we swap in a new RenderViewHost, which
happens below in RenderViewSwappedIn.

+  if (render_widget_host->IsRenderView()) {
+    RenderViewHost* rvh = RenderViewHost::From(render_widget_host);
+    if (!static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out()) {
+      // Renderer target DnD.
+      drag_dest_.reset(new WebDragDestGtk(web_contents_, content_view));
 
-  if (delegate_.get())
-    drag_dest_->set_delegate(delegate_->GetDragDestDelegate());
+      if (delegate_.get())
+        drag_dest_->set_delegate(delegate_->GetDragDestDelegate());
+    }
+  }
 
   return view;
 }
 
 RenderWidgetHostView* WebContentsViewGtk::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
   return RenderWidgetHostViewPort::CreateViewForWidget(render_widget_host);
 }
 
 void WebContentsViewGtk::SetPageTitle(const string16& title) {
@@ skipping 14 matching lines @@
   // sizing information on to the renderer.
   requested_size_ = size;
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
 }
 
 void WebContentsViewGtk::RenderViewCreated(RenderViewHost* host) {
 }
 
-void WebContentsViewGtk::RenderViewSwappedIn(RenderViewHost* host) {
+void WebContentsViewGtk::RenderViewSwappedIn(RenderViewHost* new_host,
+                                             RenderViewHost* old_host) {
+  // If we don't have a drag_dest yet, then we should set the drag dest to the
+  // new RVH.
+  // Also, not sure if this ever happens, but if the renderViewHost we're
+  // swapping out is used by the drag_dest, then we need to reset the drag_dest
+  // to the new host.
+  if (!drag_dest_.get() || (old_host &&
+      (old_host->GetView()->GetNativeView() == drag_dest_->widget()))) {
+    drag_dest_.reset(new WebDragDestGtk(web_contents_,
+                                        new_host->GetView()->GetNativeView()));
+    if (delegate_.get())
+      drag_dest_->set_delegate(delegate_->GetDragDestDelegate());
+  }
 }
 
 WebContents* WebContentsViewGtk::web_contents() {
   return web_contents_;
 }
 
 void WebContentsViewGtk::UpdateDragCursor(WebDragOperation operation) {
   drag_dest_->UpdateDragStatus(operation);
 }
 
@@ skipping 106 matching lines @@
   // We manually tell our RWHV to resize the renderer content.  This avoids
   // spurious resizes from GTK+.
   RenderWidgetHostView* rwhv = web_contents_->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetSize(size);
   if (web_contents_->GetInterstitialPage())
     web_contents_->GetInterstitialPage()->SetSize(size);
 }
 
 }  // namespace content