Fixes crah in NativeWidgetAura::IsActive()

Fixes crah in NativeWidgetAura::IsActive()

The crash happens if when the HWND is destroyed someone asks if a
child NativeWidgetAura is Active. In particular during this code path
we've gone through ~RootWindow and are in ~Window. When this happens
GetRootWindow() uses Window's implementation, which returns NULL and
we crash.

BUG=264855
TEST=none
R=ben@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=222096

[Ben Goodger (Google), 2013-09-09 21:22:11]

lgtm


On Mon, Sep 9, 2013 at 2:19 PM, <sky@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Fixes crah in NativeWidgetAura::IsActive()
>
> The crash happens if when the HWND is destroyed someone asks if a
> child NativeWidgetAura is Active. In particular during this code path
> we've gone through ~RootWindow and are in ~Window. When this happens
> GetRootWindow() uses Window's implementation, which returns NULL and
> we crash.
>
> BUG=264855
> TEST=none
> R=ben@chromium.org
>
> Please review this at
https://codereview.chromium.**org/23904005/<https://codereview.chromium.org/2...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files (+8, -3 lines):
>   M ui/views/widget/native_widget_**aura.cc
>
>
> Index: ui/views/widget/native_widget_**aura.cc
> diff --git a/ui/views/widget/native_**widget_aura.cc
> b/ui/views/widget/native_**widget_aura.cc
> index f9ebed7e85f388a420e328720d7936**ed7b80cc52..**
> 86012a5b5c49a84a21366e22678f38**dd30a5b3ea 100644
> --- a/ui/views/widget/native_**widget_aura.cc
> +++ b/ui/views/widget/native_**widget_aura.cc
> @@ -521,9 +521,14 @@ void NativeWidgetAura::Deactivate() {
>  }
>
>  bool NativeWidgetAura::IsActive() const {
> -  return window_ &&
> -      aura::client::**GetActivationClient(window_->**GetRootWindow())->
> -          GetActiveWindow() == window_;
> +  if (!window_)
> +    return false;
> +
> +  // We may up here during destruction of the root, in which case
> +  // GetRootWindow() returns NULL (~RootWindow() has run and we're in
> ~Window).
> +  aura::RootWindow* root = window_->GetRootWindow();
> +  return root &&
> +      aura::client::**GetActivationClient(root)->**GetActiveWindow() ==
> window_;
>  }
>
>  void NativeWidgetAura::**SetAlwaysOnTop(bool on_top) {
>
>
>

To unsubscribe from this group and stop receiving emails from it, send an email
to chromium-reviews+unsubscribe@chromium.org.

[commit-bot: I haz the power, 2013-09-09 21:26:32]

Change committed as 222096