Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/android/content_view_render_view.cc

Index: content/browser/android/content_view_render_view.cc
diff --git a/content/browser/android/content_view_render_view.cc b/content/browser/android/content_view_render_view.cc
index 05f248272353e63711f8fc6f1dbef3e42dd5c9cf..420e248d803c9e740b4337b0426c21ad6eb21c84 100644
--- a/content/browser/android/content_view_render_view.cc
+++ b/content/browser/android/content_view_render_view.cc
@@ -16,6 +16,7 @@
 #include "content/public/browser/android/compositor.h"
 #include "content/public/browser/android/content_view_layer_renderer.h"
 #include "jni/ContentViewRenderView_jni.h"
+#include "ui/base/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/size.h"
 
@@ -31,8 +32,11 @@ bool ContentViewRenderView::RegisterContentViewRenderView(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
-ContentViewRenderView::ContentViewRenderView(JNIEnv* env, jobject obj)
-    : buffers_swapped_during_composite_(false) {
+ContentViewRenderView::ContentViewRenderView(JNIEnv* env,
+                                             jobject obj,
+                                             ui::WindowAndroid* window_android)
+    : buffers_swapped_during_composite_(false),
+      window_android_(window_android) {
   java_obj_.Reset(env, obj);
 }
 
@@ -40,9 +44,11 @@ ContentViewRenderView::~ContentViewRenderView() {
 }
 
 // static
-static jint Init(JNIEnv* env, jobject obj) {
+static jint Init(JNIEnv* env, jobject obj, jlong native_window_android) {
+  ui::WindowAndroid* window_android =
+      reinterpret_cast<ui::WindowAndroid*>(native_window_android);
   ContentViewRenderView* content_view_render_view =
-      new ContentViewRenderView(env, obj);
+      new ContentViewRenderView(env, obj, window_android);
   return reinterpret_cast<jint>(content_view_render_view);
 }
 
@@ -110,7 +116,7 @@ void ContentViewRenderView::OnSwapBuffersCompleted() {
 
 void ContentViewRenderView::InitCompositor() {
   if (!compositor_)
-    compositor_.reset(Compositor::Create(this));
+    compositor_.reset(Compositor::Create(this, window_android_));
 }
 
 }  // namespace content