Fix check for updating WebDragDestGtk when creating a view for a RVH.

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);
 
-  // We don't want to change any state in this class for swapped out RVHs
-  // because they will not be visible at this time.
   if (render_widget_host->IsRenderView()) {
     RenderViewHost* rvh = RenderViewHost::From(render_widget_host);
-    if (!static_cast<RenderViewHostImpl*>(rvh)->is_swapped_out())
+    // If |rvh| is already the current render view host for the web contents, we
+    // need to initialize |drag_dest_| for drags to be properly handled.
+    // Otherwise, |drag_dest_| will be updated in RenderViewSwappedIn. The
+    // reason we can't simply check that this isn't a swapped out view is
+    // because there are other navigations that create views that may never be

[Charlie Reis, 2013/05/18 01:37:59]

nit: that create non-swapped-out views that may never...

[dcheng, 2013/05/18 01:49:52]

Done.

+    // displayed, e.g. a navigation that turns into a download.
+    if (rvh == web_contents_->GetRenderViewHost()) {
+      DCHECK(!drag_dest_);
       UpdateDragDest(rvh);
+    }
   }
 
   return view;
 }
 
 RenderWidgetHostView* WebContentsViewGtk::CreateViewForPopupWidget(
     RenderWidgetHost* render_widget_host) {
   return RenderWidgetHostViewPort::CreateViewForWidget(render_widget_host);
 }
 
@@ skipping 164 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