Fixed drag and drop into and out of Browser Plugin.

content/browser/web_contents/web_drag_source_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_drag_source_gtk.h"
 
 #include <string>
 
 #include "base/file_util.h"
 #include "base/nix/mime_util_xdg.h"
@@ skipping 146 matching lines @@
   // No-op.
 }
 
 void WebDragSourceGtk::DidProcessEvent(GdkEvent* event) {
   if (event->type != GDK_MOTION_NOTIFY)
     return;
 
   GdkEventMotion* event_motion = reinterpret_cast<GdkEventMotion*>(event);
   gfx::Point client = ui::ClientPoint(GetContentNativeView());
 
   if (GetRenderViewHost()) {

[Fady Samuel, 2013/04/09 20:49:12]

This guard seems weird...if (web_contents_) seems more appropriate.

[mthiesse, 2013/04/18 18:02:03]

Done.

-    GetRenderViewHost()->DragSourceMovedTo(
+    web_contents_->DragSourceMovedTo(
         client.x(), client.y(),
         static_cast<int>(event_motion->x_root),
         static_cast<int>(event_motion->y_root));
   }
 }
 
 void WebDragSourceGtk::OnDragDataGet(GtkWidget* sender,
                                      GdkDragContext* context,
                                      GtkSelectionData* selection_data,
                                      guint target_type,
@@ skipping 114 matching lines @@
 }
 
 gboolean WebDragSourceGtk::OnDragFailed(GtkWidget* sender,
                                         GdkDragContext* context,
                                         GtkDragResult result) {
   drag_failed_ = true;
 
   gfx::Point root = ui::ScreenPoint(GetContentNativeView());
   gfx::Point client = ui::ClientPoint(GetContentNativeView());
 
   if (GetRenderViewHost()) {

[Fady Samuel, 2013/04/09 20:49:12]

This guard seems weird...if (web_contents_) seems more appropriate.

[mthiesse, 2013/04/18 18:02:03]

Done.

-    GetRenderViewHost()->DragSourceEndedAt(
+    web_contents_->DragSourceEndedAt(
         client.x(), client.y(), root.x(), root.y(),
         WebDragOperationNone);
   }
 
   // Let the native failure animation run.
   return FALSE;
 }
 
 void WebDragSourceGtk::OnDragBegin(GtkWidget* sender,
                                    GdkDragContext* drag_context) {
@@ skipping 50 matching lines @@
 
   if (!download_url_.is_empty()) {
     gdk_property_delete(drag_context->source_window,
                         ui::GetAtomForTarget(ui::DIRECT_SAVE_FILE));
   }
 
   if (!drag_failed_) {
     gfx::Point root = ui::ScreenPoint(GetContentNativeView());
     gfx::Point client = ui::ClientPoint(GetContentNativeView());
 
     if (GetRenderViewHost()) {

[Fady Samuel, 2013/04/09 20:49:12]

This guard seems weird...if (web_contents_) seems more appropriate.

[mthiesse, 2013/04/18 18:02:03]

Done.

-      GetRenderViewHost()->DragSourceEndedAt(
+      web_contents_->DragSourceEndedAt(
           client.x(), client.y(), root.x(), root.y(),
           GdkDragActionToWebDragOp(drag_context->action));
     }
   }
 
   web_contents_->SystemDragEnded();
 
   drop_data_.reset();
   drag_context_ = NULL;
 }
@@ skipping 13 matching lines @@
   cairo_clip(cr);
   cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
   gdk_cairo_set_source_pixbuf(cr, drag_pixbuf_, 0, 0);
   cairo_paint(cr);
   cairo_destroy(cr);
 
   return TRUE;
 }
 
 }  // namespace content