Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/android/content_view_render_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/android/content_view_render_view.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/layers/layer.h"
 #include "content/browser/android/content_view_core_impl.h"
 #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"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 using base::android::ScopedJavaLocalRef;
 
 namespace content {
 
 // static
 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);
 }
 
 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);
 }
 
 void ContentViewRenderView::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void ContentViewRenderView::SetCurrentContentView(
     JNIEnv* env, jobject obj, int native_content_view) {
   InitCompositor();
@@ skipping 47 matching lines @@
   buffers_swapped_during_composite_ = true;
 }
 
 void ContentViewRenderView::OnSwapBuffersCompleted() {
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ContentViewRenderView_onSwapBuffersCompleted(env, java_obj_.obj());
 }
 
 void ContentViewRenderView::InitCompositor() {
   if (!compositor_)
-    compositor_.reset(Compositor::Create(this));
+    compositor_.reset(Compositor::Create(this, window_android_));
 }
 
 }  // namespace content