Index: ui/views/cocoa/bridged_native_widget.mm |
diff --git a/ui/views/cocoa/bridged_native_widget.mm b/ui/views/cocoa/bridged_native_widget.mm |
index 47373d0d4a973470d3ddc37c590af7672d842173..c54bcc32a1023532bf4634a4486ec89890649b62 100644 |
--- a/ui/views/cocoa/bridged_native_widget.mm |
+++ b/ui/views/cocoa/bridged_native_widget.mm |
@@ -366,7 +366,10 @@ BridgedNativeWidget::~BridgedNativeWidget() { |
[window_ setDelegate:nil]; |
close_window = true; |
} |
- |
+ // If we have capture, we'll get a OnMouseCaptureLost callback, which can |
tapted
2016/06/23 02:26:28
nit: it's generally good to avoid "we". (there's e
karandeepb
2016/06/23 07:58:32
Done.
|
+ // lead to a use after free crash. Hence explicitly release capture. See |
+ // crbug.com/622201. |
+ ReleaseCapture(); |
tapted
2016/06/23 02:26:28
DesktopNativeWidgetAura does it in OnHostClosed, w
karandeepb
2016/06/23 07:58:32
Yes Widget::OnMouseCaptureLost is invoked for aura
karandeepb
2016/06/24 05:34:36
Done.
|
RemoveOrDestroyChildren(); |
DCHECK(child_windows_.empty()); |
SetFocusManager(nullptr); |