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


Review URL: http://codereview.chromium.org/8800030

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113155 0039d316-1c4b-4281-b951-d872f2087c98

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();