Explicitly specify the ui::Compositor to DelegatedFrameHost

ui/compositor/compositor.cc

 // Copyright (c) 2012 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/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 157 matching lines @@
   host_->set_surface_id_namespace(surface_id_allocator_->id_namespace());
   host_->SetLayerTreeHostClientReady();
 }
 
 Compositor::~Compositor() {
   TRACE_EVENT0("shutdown", "Compositor::destructor");
 
   CancelCompositorLock();
   DCHECK(!compositor_lock_);
 
+  FOR_EACH_OBSERVER(CompositorObserver, observer_list_,
+                    OnCompositingShuttingDown(this));
+
   if (root_layer_)
     root_layer_->SetCompositor(NULL);
 
   // Stop all outstanding draws before telling the ContextFactory to tear
   // down any contexts that the |host_| may rely upon.
   host_.reset();
 
   context_factory_->RemoveCompositor(this);
 }
 
@@ skipping 104 matching lines @@
 
 void Compositor::SetVisible(bool visible) {
   host_->SetVisible(visible);
 }
 
 scoped_refptr<CompositorVSyncManager> Compositor::vsync_manager() const {
   return vsync_manager_;
 }
 
 void Compositor::AddObserver(CompositorObserver* observer) {
-#if defined(OS_MACOSX)
-  // Debugging instrumentation for crbug.com/401630.
-  // TODO(ccameron): remove this.
-  CHECK(observer);
-  if (!observer_list_.HasObserver(observer))
-    observer->observing_count_ += 1;
-#endif
-
   observer_list_.AddObserver(observer);
 }
 
 void Compositor::RemoveObserver(CompositorObserver* observer) {
-#if defined(OS_MACOSX)
-  // Debugging instrumentation for crbug.com/401630.
-  // TODO(ccameron): remove this.
-  if (observer_list_.HasObserver(observer))
-    observer->observing_count_ -= 1;
-#endif
-
   observer_list_.RemoveObserver(observer);
 }
 
 bool Compositor::HasObserver(const CompositorObserver* observer) const {
   return observer_list_.HasObserver(observer);
 }
 
 void Compositor::AddAnimationObserver(CompositorAnimationObserver* observer) {
   animation_observer_list_.AddObserver(observer);
   host_->SetNeedsAnimate();
@@ skipping 152 matching lines @@
     // Call ScheduleDraw() instead of Draw() in order to allow other
     // CompositorObservers to be notified before starting another
     // draw cycle.
     ScheduleDraw();
   }
   FOR_EACH_OBSERVER(
       CompositorObserver, observer_list_, OnCompositingEnded(this));
 }
 
 }  // namespace ui