Fix stale compositor references from ui::Layer

ui/gfx/compositor/compositor.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gfx/compositor/compositor.h"
 
 #include "ui/gfx/compositor/compositor_observer.h"
 #include "ui/gfx/compositor/layer.h"
 
 namespace ui {
 
 TextureDrawParams::TextureDrawParams()
     : blend(false),
       has_valid_alpha_channel(false),
       opacity(1.0f),
       vertically_flipped(false) {
 }
 
 // static
 Compositor*(*Compositor::compositor_factory_)(CompositorDelegate*) = NULL;
 
 Compositor::Compositor(CompositorDelegate* delegate, const gfx::Size& size)
     : delegate_(delegate),
       size_(size),
       root_layer_(NULL) {
 }
 
 Compositor::~Compositor() {
+  if (root_layer_)
+    root_layer_->SetCompositor(NULL);
 }
 
 void Compositor::ScheduleDraw() {
   delegate_->ScheduleDraw();
 }
 
 void Compositor::SetRootLayer(Layer* root_layer) {
+  if (root_layer_)
+    root_layer_->SetCompositor(NULL);
   root_layer_ = root_layer;
-  if (!root_layer_->GetCompositor())
+  if (root_layer_ && !root_layer_->GetCompositor())
     root_layer_->SetCompositor(this);
   OnRootLayerChanged();
 }
 
 void Compositor::Draw(bool force_clear) {
   if (!root_layer_)
     return;
 
   NotifyStart(force_clear);
   DrawTree();
@@ skipping 48 matching lines @@
 }
 
 void Compositor::NotifyEnd() {
   OnNotifyEnd();
   FOR_EACH_OBSERVER(CompositorObserver,
                     observer_list_,
                     OnCompositingEnded(this));
 }
 
 }  // namespace ui