Fix deadlock between UI thread and drag and drop thread on Windows.

content/browser/web_contents/web_drag_source_win.h

Index: content/browser/web_contents/web_drag_source_win.h
diff --git a/content/browser/web_contents/web_drag_source_win.h b/content/browser/web_contents/web_drag_source_win.h
index 898f3c3ada546fd21966d763e5dd9d0993247d63..0d703714c98d189ea21153154f3364ddf06e16d3 100644
--- a/content/browser/web_contents/web_drag_source_win.h
+++ b/content/browser/web_contents/web_drag_source_win.h
@@ -12,6 +12,10 @@
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/point.h"
 
+namespace ui {
+class OSExchangeData;
+}  // namespace ui
+
 namespace content {
 class RenderViewHost;
 class WebContents;
@@ -33,6 +37,7 @@ class WebDragSource : public ui::DragSourceWin,
                        const NotificationDetails& details);
 
   void set_effect(DWORD effect) { effect_ = effect; }
+  void set_data(ui::OSExchangeData* data) { data_ = data; }

[sky, 2013/04/26 22:10:22]

Document ownership.

[dcheng, 2013/04/26 22:20:10]

Done.

 
  protected:
   // ui::DragSourceWin
@@ -60,6 +65,8 @@ class WebDragSource : public ui::DragSourceWin,
 
   DWORD effect_;
 
+  ui::OSExchangeData* data_;
+
   DISALLOW_COPY_AND_ASSIGN(WebDragSource);
 };