Implement TextureImageTransportSurface using texture mailbox

content/browser/renderer_host/render_widget_host_view_android.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/renderer_host/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
@@ skipping 39 matching lines @@
     RenderWidgetHostImpl* widget_host,
     ContentViewCoreImpl* content_view_core)
     : host_(widget_host),
       // ContentViewCoreImpl represents the native side of the Java
       // ContentViewCore.  It being NULL means that it is not attached to the
       // View system yet, so we treat it as hidden.
       is_hidden_(!content_view_core),
       content_view_core_(NULL),
       ime_adapter_android_(ALLOW_THIS_IN_INITIALIZER_LIST(this)),
       cached_background_color_(SK_ColorWHITE),
-      texture_id_in_layer_(0) {
+      texture_id_in_layer_(0),
+      current_buffer_id_(0) {
   if (CompositorImpl::UsesDirectGL()) {
     surface_texture_transport_.reset(new SurfaceTextureTransportClient());
     layer_ = surface_texture_transport_->Initialize();
   } else {
     // TODO: Cannot use CompositorImpl::CompositorSupport() in unit tests.
     texture_layer_.reset(WebKit::WebExternalTextureLayer::create());
     layer_ = texture_layer_->layer();
   }
 
   host_->SetView(this);
   SetContentViewCore(content_view_core);
   // RenderWidgetHost is initialized as visible. If is_hidden_ is true, tell
   // RenderWidgetHost to hide.
   if (is_hidden_)
     host_->WasHidden();
 
   layer_->setOpaque(true);
   layer_->setDrawsContent(!is_hidden_);
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
   if (!shared_surface_.is_null()) {
     ImageTransportFactoryAndroid::GetInstance()->DestroySharedSurfaceHandle(
         shared_surface_);
   }
+  if (texture_id_in_layer_)

[piman, 2012/11/30 03:54:32]

nit: braces around body

+    ImageTransportFactoryAndroid::GetInstance()->DeleteTexture(
+        texture_id_in_layer_);
 }
 
 void RenderWidgetHostViewAndroid::InitAsChild(gfx::NativeView parent_view) {
   NOTIMPLEMENTED();
 }
 
 void RenderWidgetHostViewAndroid::InitAsPopup(
     RenderWidgetHostView* parent_host_view, const gfx::Rect& pos) {
   NOTIMPLEMENTED();
 }
@@ skipping 288 matching lines @@
 
   content_view_core_->ShowDisambiguationPopup(target_rect, zoomed_bitmap);
 }
 
 void RenderWidgetHostViewAndroid::OnAcceleratedCompositingStateChange() {
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceBuffersSwapped(
     const GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params& params,
     int gpu_host_id) {
-  texture_layer_->setTextureId(params.surface_handle);
-  DCHECK(texture_layer_->layer() == layer_);
-  layer_->setBounds(params.size);
-  texture_id_in_layer_ = params.surface_handle;
+  ImageTransportFactoryAndroid* factory =
+      ImageTransportFactoryAndroid::GetInstance();
+
+  // TODO(sievers): When running the impl thread in the browser we
+  // need to delay the ACK until after commit and use more than a single
+  // texture.
+  DCHECK(!CompositorImpl::CompositorSupport()->isThreadingEnabled());
+
+  uint64 previous_buffer = current_buffer_id_;
+  if (previous_buffer && texture_id_in_layer_) {
+    DCHECK(id_to_mailbox_.find(previous_buffer) != id_to_mailbox_.end());
+    ImageTransportFactoryAndroid::GetInstance()->ReleaseTexture(
+        texture_id_in_layer_,
+        reinterpret_cast<const signed char*>(
+            id_to_mailbox_[previous_buffer].c_str()));
+  }
+
+  current_buffer_id_ = params.surface_handle;
+  if (!texture_id_in_layer_) {
+    texture_id_in_layer_ = factory->CreateTexture();
+    texture_layer_->setTextureId(texture_id_in_layer_);
+  }
+
+  DCHECK(id_to_mailbox_.find(current_buffer_id_) != id_to_mailbox_.end());
+  ImageTransportFactoryAndroid::GetInstance()->AcquireTexture(
+      texture_id_in_layer_,
+      reinterpret_cast<const signed char*>(
+          id_to_mailbox_[current_buffer_id_].c_str()));
+  texture_layer_->layer()->invalidate();
+  texture_layer_->layer()->setBounds(params.size);
   texture_size_in_layer_ = params.size;
 
-  // TODO(sievers): When running the impl thread in the browser we
-  // need to delay the ACK until after commit.
-  DCHECK(!CompositorImpl::CompositorSupport()->isThreadingEnabled());
   uint32 sync_point =
       ImageTransportFactoryAndroid::GetInstance()->InsertSyncPoint();
   RenderWidgetHostImpl::AcknowledgeBufferPresent(
-      params.route_id, gpu_host_id, true, sync_point);
+      params.route_id, gpu_host_id, previous_buffer, sync_point);
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfacePostSubBuffer(
     const GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params& params,
     int gpu_host_id) {
   NOTREACHED();
 }
 
 void RenderWidgetHostViewAndroid::AcceleratedSurfaceSuspend() {
   NOTREACHED();
 }
 
+void RenderWidgetHostViewAndroid::AcceleratedSurfaceNew(
+    int32 width_in_pixel, int32 height_in_pixel, uint64 surface_id,
+    const std::string& mailbox_name) {
+  DCHECK(surface_id == 1 || surface_id == 2);
+  id_to_mailbox_[surface_id] = mailbox_name;
+}
+
+void RenderWidgetHostViewAndroid::AcceleratedSurfaceRelease(uint64 surface_id) {
+  // This tells us we should free the frontbuffer.
+  if (texture_id_in_layer_) {
+    texture_layer_->setTextureId(0);
+    ImageTransportFactoryAndroid::GetInstance()->DeleteTexture(
+        texture_id_in_layer_);
+    texture_id_in_layer_ = 0;
+  }
+}
+
 bool RenderWidgetHostViewAndroid::HasAcceleratedSurface(
     const gfx::Size& desired_size) {
   NOTREACHED();
   return false;
 }
 
 void RenderWidgetHostViewAndroid::StartContentIntent(
     const GURL& content_url) {
   if (content_view_core_)
     content_view_core_->StartContentIntent(content_url);
@@ skipping 168 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content