Merge 20436 - Fix a crash that happens if a tab is closed while...

base/base_drag_source.cc

Index: base/base_drag_source.cc
===================================================================
--- base/base_drag_source.cc	(revision 20694)
+++ base/base_drag_source.cc	(working copy)
@@ -7,7 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 // BaseDragSource, public:
 
-BaseDragSource::BaseDragSource() : ref_count_(0) {
+BaseDragSource::BaseDragSource() : ref_count_(0), cancel_drag_(false) {
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -15,6 +15,9 @@
 
 HRESULT BaseDragSource::QueryContinueDrag(BOOL escape_pressed,
                                           DWORD key_state) {
+  if (cancel_drag_)
+    return DRAGDROP_S_CANCEL;
+
   if (escape_pressed) {
     OnDragSourceCancel();
     return DRAGDROP_S_CANCEL;
Property changes on: base\base_drag_source.cc
___________________________________________________________________
Added: svn:mergeinfo
   Merged /branches/chrome_webkit_merge_branch/base/base_drag_source.cc:r69-2775
   Merged /trunk/src/base/base_drag_source.cc:r20436