Fix assert with webkit compositor. The assert was hitting because we

Fix assert with webkit compositor. The assert was hitting because we
were attempting shutdown before destroying the compositor.

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


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=113155

[Ben Goodger (Google), 2011-12-06 00:46:42]

LGTM

On Mon, Dec 5, 2011 at 4:42 PM, <sky@chromium.org> wrote:

> Reviewers: Ben Goodger (Google),
>
> Description:
> Fix assert with webkit compositor. The assert was hitting because we
> were attempting shutdown before destroying the compositor.
>
> BUG=104360
> TEST=none
> R=ben@chromium.org
>
>
> Please review this at
http://codereview.chromium.**org/8800030/<http://codereview.chromium.org/8800...
>
> SVN Base:
svn://svn.chromium.org/chrome/**trunk/src<http://svn.chromium.org/chrome/trunk/src>
>
> Affected files:
>  M ui/aura/desktop.cc
>
>
> Index: ui/aura/desktop.cc
> diff --git a/ui/aura/desktop.cc b/ui/aura/desktop.cc
> index 38818e69f46b9ae7776eb9f29d2b8a**256da85d82..**
> 7bf25d3abb037af965a710fe6d7e5f**d8bb6fac0c 100644
> --- a/ui/aura/desktop.cc
> +++ b/ui/aura/desktop.cc
> @@ -429,6 +429,9 @@ Desktop::Desktop()
>
>  Desktop::~Desktop() {
>   in_destructor_ = true;
> +  // Make sure to destroy the compositor before terminating so that state
> is
> +  // cleared and we don't hit asserts.
> +  compositor_ = NULL;
>  #ifdef USE_WEBKIT_COMPOSITOR
>   if (!ui::Compositor::compositor_**factory())
>     ui::CompositorCC::Terminate();
>
>
>

[commit-bot: I haz the power, 2011-12-06 04:47:53]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/sky@chromium.org/8800030/2001

[commit-bot: I haz the power, 2011-12-06 07:43:00]

Change committed as 113155