Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/android/content_view_render_view.h

Index: content/browser/android/content_view_render_view.h
diff --git a/content/browser/android/content_view_render_view.h b/content/browser/android/content_view_render_view.h
index 65c3874a66fc8e5f3bc03c9572dbc224f0195fba..fbeed547081d02472330e9eafbff99c184b123e0 100644
--- a/content/browser/android/content_view_render_view.h
+++ b/content/browser/android/content_view_render_view.h
@@ -10,11 +10,14 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "content/public/browser/android/compositor_client.h"
+#include "content/public/browser/android/compositor_provider.h"
+#include "content/public/browser/android/compositor_provider_client.h"
 
 namespace content {
 class Compositor;
 
-class ContentViewRenderView : public CompositorClient {
+class ContentViewRenderView : public CompositorClient,
+                              public CompositorProvider {
  public:
   // Registers the JNI methods for ContentViewRender.
   static bool RegisterContentViewRenderView(JNIEnv* env);
@@ -29,12 +32,19 @@ class ContentViewRenderView : public CompositorClient {
   void SurfaceSetSize(JNIEnv* env, jobject obj, jint width, jint height);
   jboolean Composite(JNIEnv* env, jobject obj);
   jboolean CompositeToBitmap(JNIEnv* env, jobject obj, jobject java_bitmap);
+  jint GetNativeCompositorProviderPtr(JNIEnv* env, jobject obj);
 
   // CompositorClient ---------------------------------------------------------
   virtual void ScheduleComposite() OVERRIDE;
   virtual void OnSwapBuffersPosted() OVERRIDE;
   virtual void OnSwapBuffersCompleted() OVERRIDE;
 
+  // CompositorProvider -------------------------------------------------------
+  virtual Compositor* GetCompositor() OVERRIDE;
+  // Since the compositor never switches out, do not need to implement this.
+  virtual void AddCompositorProviderClient(CompositorProviderClient* client)
+      OVERRIDE {}
+
  private:
   virtual ~ContentViewRenderView();