Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/android/content_view_core_impl.h

Index: content/browser/android/content_view_core_impl.h
diff --git a/content/browser/android/content_view_core_impl.h b/content/browser/android/content_view_core_impl.h
index b9da583223701833cffd78059bf070ec644a0a8b..1228da4d26806075035b24de0aaaa442b1c2f879 100644
--- a/content/browser/android/content_view_core_impl.h
+++ b/content/browser/android/content_view_core_impl.h
@@ -32,6 +32,7 @@ class WindowAndroid;
 
 namespace content {
 class RenderWidgetHostViewAndroid;
+class Compositor;
 struct MenuItem;
 
 // TODO(jrg): this is a shell.  Upstream the rest.
@@ -63,6 +64,8 @@ class ContentViewCoreImpl : public ContentViewCore,
   virtual void RequestContentClipping(const gfx::Rect& clipping,
                                       const gfx::Size& content_size) OVERRIDE;
   virtual void PauseVideo() OVERRIDE;
+  virtual void SetCompositor(Compositor* compositor) OVERRIDE;
+  virtual Compositor* GetCompositor() const OVERRIDE { return compositor_; }
 
   // --------------------------------------------------------------------------
   // Methods called from Java via JNI
@@ -385,6 +388,10 @@ class ContentViewCoreImpl : public ContentViewCore,
   // will be sent to Renderer once it is ready.
   int device_orientation_;
 
+  // ContentViewCore does not own the compositor.  This reference is kept to
+  // allow for adding observers to the compositor.
+  Compositor* compositor_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };