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"
@@ skipping 35 matching lines @@
 
 void ContentViewRenderView::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
 void ContentViewRenderView::SetCurrentContentView(
     JNIEnv* env, jobject obj, int native_content_view) {
   InitCompositor();
   ContentViewCoreImpl* content_view =
       reinterpret_cast<ContentViewCoreImpl*>(native_content_view);
-  if (content_view)
+  if (content_view) {
     compositor_->SetRootLayer(content_view->GetLayer());
-  else
+    content_view->SetCompositor(compositor_.get());
+  } else
     compositor_->SetRootLayer(cc::Layer::Create());
 }
 
+void ContentViewRenderView::RemovePreviousContentView(JNIEnv* env,
+                                                      jobject obj,

[no sievers, 2013/10/16 23:34:23]

I don't think we need this here, see my comment in
render_widget_host_view_android.cc

What if we passed the compositor instance (or NULL for WebView) into the
ContentViewCore constructor?

I think it's easy enough for an app to let the browser compositor outlive all
ContentViewCores. If not, then we could have a SetCompositor() (or
WillDestroyCompositor() or something), that still doesn't have to be called
every time visibility changes.

[powei, 2013/10/19 00:05:18]

Done.  Removed.

+                                                      int native_content_view) {
+  DCHECK(compositor_);
+  ContentViewCoreImpl* content_view =
+      reinterpret_cast<ContentViewCoreImpl*>(native_content_view);
+  if (content_view) {
+    content_view->SetCompositor(NULL);
+  }
+}
+
 void ContentViewRenderView::SurfaceCreated(
     JNIEnv* env, jobject obj, jobject jsurface) {
   InitCompositor();
   compositor_->SetSurface(jsurface);
 }
 
 void ContentViewRenderView::SurfaceDestroyed(JNIEnv* env, jobject obj) {
   compositor_->SetSurface(NULL);
 }
 
@@ skipping 24 matching lines @@
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ContentViewRenderView_onSwapBuffersCompleted(env, java_obj_.obj());
 }
 
 void ContentViewRenderView::InitCompositor() {
   if (!compositor_)
     compositor_.reset(Compositor::Create(this));
 }
 
 }  // namespace content