|
|
Fix the crash that could occur when the window is closed while web contents drag is in progress.
We now check if the contents view window is gone after system drag-and-drop returns. Bail out immediately if so. With this fix, we do not need the delay-close-at-drag workaround any more.
This fix applies towards to both Windows and Aura. We do not have problem on GTK since it does not run nested message loop.
On Mac, the system drag-and-drop is invoked from the Cocoa view that could outlive the WebContentsViewMac due to Cocoa retains count (see comment in WebContentsViewMac::~WebContentsViewMac). However, we do need to ensure that WebDragSource stops using web contents when it is gone.
BUG= 145363
TEST=Manual test by following the steps in the bug
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=159366
Total comments: 1
Total comments: 2
Total comments: 1
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+133 lines, -138 lines) |
Patch |
 |
M |
content/browser/web_contents/web_contents_drag_win.h
|
View
|
1
2
|
1 chunk |
+5 lines, -1 line |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_drag_win.cc
|
View
|
1
|
9 chunks |
+70 lines, -26 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_impl.cc
|
View
|
1
2
3
|
2 chunks |
+0 lines, -10 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_android.h
|
View
|
1
2
3
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_android.cc
|
View
|
1
2
3
|
1 chunk |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_aura.h
|
View
|
1
2
3
|
2 chunks |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_aura.cc
|
View
|
1
2
3
|
8 chunks |
+41 lines, -24 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_gtk.h
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_gtk.cc
|
View
|
|
1 chunk |
+0 lines, -7 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_mac.h
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_mac.mm
|
View
|
|
2 chunks |
+1 line, -7 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_win.h
|
View
|
|
2 chunks |
+0 lines, -9 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_contents_view_win.cc
|
View
|
|
4 chunks |
+4 lines, -18 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_drag_source_mac.h
|
View
|
|
1 chunk |
+3 lines, -0 lines |
0 comments
|
Download
|
 |
M |
content/browser/web_contents/web_drag_source_mac.mm
|
View
|
|
3 chunks |
+9 lines, -0 lines |
0 comments
|
Download
|
 |
M |
content/public/browser/web_contents_view.h
|
View
|
|
1 chunk |
+0 lines, -6 lines |
0 comments
|
Download
|
 |
M |
content/test/test_web_contents_view.h
|
View
|
|
1 chunk |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
content/test/test_web_contents_view.cc
|
View
|
|
1 chunk |
+0 lines, -7 lines |
0 comments
|
Download
|
Total messages: 9 (0 generated)
|