Adding compositor callbacks to RenderWidgetHostViewAndroid

content/browser/renderer_host/render_widget_host_view_android.cc

Index: content/browser/renderer_host/render_widget_host_view_android.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_android.cc b/content/browser/renderer_host/render_widget_host_view_android.cc
index 8382811d8010dd1aa4e1cf30428cdfdc807f174e..6cbba4f4738e5f23fad7e18842475ac969cc2179 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -46,6 +46,8 @@
 #include "skia/ext/image_operations.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
+#include "ui/base/android/window_android.h"
+#include "ui/base/android/window_android_observer.h"
 #include "ui/gfx/android/device_display_info.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/display.h"
@@ -116,7 +118,7 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
       flush_input_requested_(false),
       accelerated_surface_route_id_(0) {
   if (!UsingDelegatedRenderer()) {
-    texture_layer_ = cc::TextureLayer::Create(this);
+    texture_layer_ = cc::TextureLayer::Create(NULL);
     layer_ = texture_layer_;
   }
 
@@ -192,6 +194,9 @@ void RenderWidgetHostViewAndroid::WasShown() {
     return;
 
   host_->WasShown();
+
+  if (content_view_core_ && !UsingSynchronousCompositor())
+      content_view_core_->GetWindowAndroid()->AddObserver(this);
 }
 
 void RenderWidgetHostViewAndroid::WasHidden() {
@@ -203,6 +208,9 @@ void RenderWidgetHostViewAndroid::WasHidden() {
   // Inform the renderer that we are being hidden so it can reduce its resource
   // utilization.
   host_->WasHidden();
+
+  if (content_view_core_ && !UsingSynchronousCompositor())
+      content_view_core_->GetWindowAndroid()->RemoveObserver(this);
 }
 
 void RenderWidgetHostViewAndroid::WasResized() {
@@ -506,7 +514,8 @@ void RenderWidgetHostViewAndroid::RenderProcessGone(
 
 void RenderWidgetHostViewAndroid::Destroy() {
   RemoveLayers();
-  content_view_core_ = NULL;
+  // This must happen before setting host_ NULL.
+  SetContentViewCore(NULL);
 
   // The RenderWidgetHost's destruction led here, so don't call it.
   host_ = NULL;
@@ -708,7 +717,7 @@ void RenderWidgetHostViewAndroid::SwapDelegatedFrame(
       frame_provider_ = new cc::DelegatedFrameProvider(
           resource_collection_.get(), frame_data.Pass());
       delegated_renderer_layer_ =
-          cc::DelegatedRendererLayer::Create(this, frame_provider_);
+          cc::DelegatedRendererLayer::Create(NULL, frame_provider_);
       layer_ = delegated_renderer_layer_;
       if (are_layers_attached_)
         AttachLayers();
@@ -846,6 +855,7 @@ void RenderWidgetHostViewAndroid::BuffersSwapped(
 
   if (!texture_id_in_layer_) {
     texture_id_in_layer_ = factory->CreateTexture();
+    texture_layer_->SetTextureId(texture_id_in_layer_);
     texture_layer_->SetIsDrawable(true);
     texture_layer_->SetContentsOpaque(true);
   }
@@ -1244,6 +1254,11 @@ void RenderWidgetHostViewAndroid::SetContentViewCore(
   if (are_layers_attached_)
     RemoveLayers();
 
+  if (content_view_core == NULL) {
+    if (content_view_core_ && !UsingSynchronousCompositor())
+      content_view_core_->GetWindowAndroid()->RemoveObserver(this);
+  }
+
   content_view_core_ = content_view_core;
 
   if (GetBrowserAccessibilityManager()) {
@@ -1254,8 +1269,11 @@ void RenderWidgetHostViewAndroid::SetContentViewCore(
         SetContentViewCore(obj);
   }
 
-  if (are_layers_attached_)
+  if (are_layers_attached_) {
     AttachLayers();
+    if (content_view_core_ && !UsingSynchronousCompositor())
+      content_view_core_->GetWindowAndroid()->AddObserver(this);
+  }
 }
 
 void RenderWidgetHostViewAndroid::RunAckCallbacks() {
@@ -1271,20 +1289,22 @@ void RenderWidgetHostViewAndroid::HasTouchEventHandlers(
     content_view_core_->HasTouchEventHandlers(need_touch_events);
 }
 
-unsigned RenderWidgetHostViewAndroid::PrepareTexture() {
-  RunAckCallbacks();
-  return texture_id_in_layer_;
+bool RenderWidgetHostViewAndroid::UsingSynchronousCompositor() const {
+  DCHECK(host_);

[no sievers, 2013/11/14 22:01:01]

nit: Can this just become a member variable |using_synchronous_compositor_| that
gets initialized in the constructor?

[powei, 2013/11/15 02:18:26]

Done.

+  return SynchronousCompositorImpl::FromID(host_->GetProcess()->GetID(),
+                                           host_->GetRoutingID()) != NULL;
 }
 
-void RenderWidgetHostViewAndroid::DidCommitFrameData() {
+void RenderWidgetHostViewAndroid::OnCompositingDidCommit(
+    Compositor* compositor) {
   RunAckCallbacks();
 }
 
-bool RenderWidgetHostViewAndroid::PrepareTextureMailbox(
-    cc::TextureMailbox* mailbox,
-    scoped_ptr<cc::SingleReleaseCallback>* release_callback,
-    bool use_shared_memory) {
-  return false;
+void RenderWidgetHostViewAndroid::OnDetachCompositor(
+    Compositor* compositor) {
+  DCHECK(content_view_core_);
+  DCHECK(!UsingSynchronousCompositor());
+  content_view_core_->GetWindowAndroid()->RemoveObserver(this);

[no sievers, 2013/11/14 22:01:01]

RunAckCallbacks() here.
And being removed as an observer could actually be implied.

[powei, 2013/11/15 02:18:26]

Done.

 }
 
 void RenderWidgetHostViewAndroid::OnLostResources() {