Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/renderer_host/compositor_impl_android.h

Index: content/browser/renderer_host/compositor_impl_android.h
diff --git a/content/browser/renderer_host/compositor_impl_android.h b/content/browser/renderer_host/compositor_impl_android.h
index 1b033f3796f99b92e6f94dfed27da259a74e9494..796bda40772f747abb3153bb9c9710cec20b3afd 100644
--- a/content/browser/renderer_host/compositor_impl_android.h
+++ b/content/browser/renderer_host/compositor_impl_android.h
@@ -10,6 +10,7 @@
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
+#include "base/observer_list.h"
 #include "cc/resources/ui_resource_client.h"
 #include "cc/trees/layer_tree_host_client.h"
 #include "content/browser/renderer_host/image_transport_factory_android.h"
@@ -28,6 +29,7 @@ class ScopedUIResource;
 
 namespace content {
 class CompositorClient;
+class CompositorObserver;
 class GraphicsContext;
 
 // -----------------------------------------------------------------------------
@@ -83,7 +85,7 @@ class CONTENT_EXPORT CompositorImpl
       OVERRIDE;
   virtual void DidInitializeOutputSurface(bool success) OVERRIDE {}
   virtual void WillCommit() OVERRIDE {}
-  virtual void DidCommit() OVERRIDE {}
+  virtual void DidCommit() OVERRIDE;
   virtual void DidCommitAndDrawFrame() OVERRIDE {}
   virtual void DidCompleteSwapBuffers() OVERRIDE;
   virtual void ScheduleComposite() OVERRIDE;
@@ -98,6 +100,12 @@ class CONTENT_EXPORT CompositorImpl
   // ImageTransportFactoryAndroidObserver implementation.
   virtual void OnLostResources() OVERRIDE;
 
+  // Compositor does not own observers. It is the responsibility of the
+  // observer to remove itself when it is done observing.
+  virtual void AddObserver(CompositorObserver* observer) OVERRIDE;
+  virtual void RemoveObserver(CompositorObserver* observer) OVERRIDE;
+  virtual bool HasObserver(CompositorObserver* observer) OVERRIDE;
+
  private:
   WebKit::WebGLId BuildBasicTexture();
   WebKit::WGC3Denum GetGLFormatForBitmap(gfx::JavaBitmap& bitmap);
@@ -121,6 +129,8 @@ class CONTENT_EXPORT CompositorImpl
         UIResourceMap;
   UIResourceMap ui_resource_map_;
 
+  ObserverList<CompositorObserver> observer_list_;
+
   DISALLOW_COPY_AND_ASSIGN(CompositorImpl);
 };