From 420dabb1f51bec8fbad069365f4cdb212f66e4f4 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Thu, 13 Dec 2012 01:10:14 +0000 Subject: 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 --- ui/views/widget/desktop_aura/desktop_native_widget_aura.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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) { -- cgit v1.1