summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 01:10:14 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-12-13 01:10:14 +0000
commit420dabb1f51bec8fbad069365f4cdb212f66e4f4 (patch)
tree98db2cc0c8d394dc8b5c3dbb430e1ebd224fd47d
parent0cfb748b3291b1919a8835021432b8803f1c229f (diff)
downloadchromium_src-420dabb1f51bec8fbad069365f4cdb212f66e4f4.zip
chromium_src-420dabb1f51bec8fbad069365f4cdb212f66e4f4.tar.gz
chromium_src-420dabb1f51bec8fbad069365f4cdb212f66e4f4.tar.bz2
Fix InputMethodEventFilter being used after destruction by RootWindow in DesktopNativeWidgetAura's destructor.
BUG=163931 Review URL: https://codereview.chromium.org/11416381 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172746 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--ui/views/widget/desktop_aura/desktop_native_widget_aura.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
index 8294fc6..1b9aaf2 100644
--- a/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
+++ b/ui/views/widget/desktop_aura/desktop_native_widget_aura.cc
@@ -86,6 +86,10 @@ DesktopNativeWidgetAura::~DesktopNativeWidgetAura() {
delete native_widget_delegate_;
else
CloseNow();
+
+ stacking_client_.reset(); // Uses root_window_ at destruction.
+ root_window_.reset(); // Uses input_method_event_filter_ at destruction.
+ input_method_event_filter_.reset();
}
// static
@@ -516,7 +520,7 @@ void DesktopNativeWidgetAura::OnWindowDestroyed() {
window_ = NULL;
native_widget_delegate_->OnNativeWidgetDestroyed();
if (ownership_ == Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET)
- delete this;
+ delete this;
}
void DesktopNativeWidgetAura::OnWindowTargetVisibilityChanged(bool visible) {