All together now

content/browser/aura/browser_compositor_output_surface.cc

Index: content/browser/aura/browser_compositor_output_surface.cc
diff --git a/content/browser/aura/browser_compositor_output_surface.cc b/content/browser/aura/browser_compositor_output_surface.cc
index 36e5dcdbfda672864c396c8d69386296dbb33197..532833c0da050cce764eec76dd65c82b941cf53b 100644
--- a/content/browser/aura/browser_compositor_output_surface.cc
+++ b/content/browser/aura/browser_compositor_output_surface.cc
@@ -10,7 +10,6 @@
 #include "base/message_loop/message_loop_proxy.h"
 #include "base/strings/string_number_conversions.h"
 #include "cc/output/compositor_frame.h"
-#include "content/browser/aura/reflector_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 #include "content/common/gpu/client/webgraphicscontext3d_command_buffer_impl.h"
 #include "ui/compositor/compositor.h"
@@ -22,7 +21,7 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
     const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
     int surface_id,
     IDMap<BrowserCompositorOutputSurface>* output_surface_map,
-    base::MessageLoopProxy* compositor_message_loop,
+    const scoped_refptr<base::MessageLoopProxy>& compositor_message_loop,
     base::WeakPtr<ui::Compositor> compositor)
     : OutputSurface(context_provider),
       surface_id_(surface_id),
@@ -45,9 +44,13 @@ BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
 
 BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
   DCHECK(CalledOnValidThread());
-  if (!HasClient())
+  if (!HasClient()) {
+    DCHECK(!observer_list_.might_have_observers());
     return;
+  }
   output_surface_map_->Remove(surface_id_);
+  // Don't delete the actual objects; we don't own them.
+  FOR_EACH_OBSERVER(Observer, observer_list_, OnDelete());
 }
 
 bool BrowserCompositorOutputSurface::BindToClient(
@@ -64,8 +67,7 @@ bool BrowserCompositorOutputSurface::BindToClient(
 void BrowserCompositorOutputSurface::Reshape(gfx::Size size,
                                              float scale_factor) {
   OutputSurface::Reshape(size, scale_factor);
-  if (reflector_.get())
-    reflector_->OnReshape(size);
+  FOR_EACH_OBSERVER(Observer, observer_list_, OnReshape(size));
 }
 
 void BrowserCompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
@@ -80,12 +82,13 @@ void BrowserCompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
   context_provider_->Context3d()->shallowFlushCHROMIUM();
   command_buffer_proxy->SetLatencyInfo(frame->metadata.latency_info);
 
-  if (reflector_.get()) {
-    if (frame->gl_frame_data->sub_buffer_rect ==
-        gfx::Rect(frame->gl_frame_data->size))
-      reflector_->OnSwapBuffers();
-    else
-      reflector_->OnPostSubBuffer(frame->gl_frame_data->sub_buffer_rect);
+  if (frame->gl_frame_data->sub_buffer_rect ==
+      gfx::Rect(frame->gl_frame_data->size)) {
+    FOR_EACH_OBSERVER(Observer, observer_list_, OnSwapBuffers());
+  } else {
+    FOR_EACH_OBSERVER(Observer,
+                      observer_list_,
+                      OnPostSubBuffer(frame->gl_frame_data->sub_buffer_rect));
   }
 
   OutputSurface::SwapBuffers(frame);
@@ -103,8 +106,15 @@ void BrowserCompositorOutputSurface::OnUpdateVSyncParameters(
                  compositor_, timebase, interval));
 }
 
-void BrowserCompositorOutputSurface::SetReflector(ReflectorImpl* reflector) {
-  reflector_ = reflector;
+void BrowserCompositorOutputSurface::AddObserver(Observer* observer) {
+  DCHECK(CalledOnValidThread());
+  DCHECK(HasClient());
+  observer_list_.AddObserver(observer);
+}
+
+void BrowserCompositorOutputSurface::RemoveObserver(Observer* observer) {
+  DCHECK(CalledOnValidThread());
+  observer_list_.RemoveObserver(observer);
 }
 
 }  // namespace content