Implement TextureImageTransportSurface using texture mailbox

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 09850937427523adf5ab19f8309e797d73f8bb6f..1b2cc771b63a58e11dab50cfebc2462d57b25192 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.cc
+++ b/content/browser/renderer_host/render_widget_host_view_android.cc
@@ -49,7 +49,8 @@ RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
       is_hidden_(!content_view_core),
       content_view_core_(content_view_core),
       ime_adapter_android_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
-      texture_layer_(WebKit::WebExternalTextureLayer::create()) {
+      texture_layer_(WebKit::WebExternalTextureLayer::create()),
+      current_buffer_id_(0) {
   host_->SetView(this);
   // RenderWidgetHost is initialized as visible. If is_hidden_ is true, tell
   // RenderWidgetHost to hide.
@@ -309,8 +310,29 @@ void RenderWidgetHostViewAndroid::OnAcceleratedCompositingStateChange() {
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
-  texture_layer_->setTextureId(params.surface_handle);
+  DCHECK(id_to_texture_map_.find(params.surface_handle) !=
+         id_to_texture_map_.end());
+  // TODO(sievers): The compositor should do this on the impl thread.
+  // And the release should happen after the next commit.
+
+  if (current_buffer_id_) {
+    TextureMap::const_iterator it = id_to_texture_map_.find(
+        current_buffer_id_);
+    DCHECK(it != id_to_texture_map_.end());
+    ImageTransportFactoryAndroid::GetInstance()->ReleaseTexture(
+        it->second->id, it->second->mailbox_name.get());
+  }
+
+  TextureMap::const_iterator it =
+      id_to_texture_map_.find(params.surface_handle);
+  DCHECK(it != id_to_texture_map_.end());
+  const TextureInfo* texture = it->second;
+  current_buffer_id_ = params.surface_handle;
+  ImageTransportFactoryAndroid::GetInstance()->AcquireTexture(
+      texture->id, texture->mailbox_name.get());
+  texture_layer_->setTextureId(texture->id);
   texture_layer_->layer()->invalidate();
+
   // TODO(sievers): The view and layer should get sized proactively.
   if (((gfx::Size)texture_layer_->layer()->bounds()).IsEmpty())
     texture_layer_->layer()->setBounds(
@@ -336,6 +358,43 @@ void RenderWidgetHostViewAndroid::AcceleratedSurfaceSuspend() {
   NOTREACHED();
 }
 
+void RenderWidgetHostViewAndroid::AcceleratedSurfaceNew(
+    int32 width_in_pixel, int32 height_in_pixel, uint64 surface_id,
+    const std::string& mailbox_name) {
+  LOG(INFO) << "RenderWidgetHostViewAndroid::AcceleratedSurfaceNew " <<
+            surface_id;
+  DCHECK(surface_id);
+  if (id_to_texture_map_.find(surface_id) != id_to_texture_map_.end()) {
+    // TODO: Should this really happen? (It does during Resize and such)
+    TextureInfo* texture = id_to_texture_map_[surface_id];
+    memcpy(texture->mailbox_name.get(),
+           mailbox_name.c_str(),
+           mailbox_name.length());
+  } else {
+    scoped_ptr<TextureInfo> texture(new TextureInfo);
+    texture->id = ImageTransportFactoryAndroid::GetInstance()->CreateTexture();
+    texture->mailbox_name.reset(new signed char[mailbox_name.length()]);
+    memcpy(texture->mailbox_name.get(),
+           mailbox_name.c_str(),
+           mailbox_name.length());
+    id_to_texture_map_[surface_id] = texture.release();
+  }
+
+  // There should only ever be a front- and backbuffer.
+  DCHECK(id_to_texture_map_.size() <= 2);
+}
+
+void RenderWidgetHostViewAndroid::AcceleratedSurfaceRelease(uint64 surface_id) {
+  LOG(INFO) << "RenderWidgetHostViewAndroid::AcceleratedSurfaceRelease " <<
+            surface_id;
+  DCHECK(surface_id);
+  TextureMap::iterator it = id_to_texture_map_.find(surface_id);
+  DCHECK(it != id_to_texture_map_.end());
+  ImageTransportFactoryAndroid::GetInstance()->DeleteTexture(it->second->id);
+  delete it->second;
+  id_to_texture_map_.erase(it);
+}
+
 bool RenderWidgetHostViewAndroid::HasAcceleratedSurface(
     const gfx::Size& desired_size) {
   NOTREACHED();