Enable SurfaceTexture based zero-copy texture uploading on Android platform

content/common/gpu/client/command_buffer_proxy_impl.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/common/gpu/client/command_buffer_proxy_impl.h"
 
 #include "base/callback.h"
+#include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "base/stl_util.h"
 #include "content/common/child_process_messages.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/client/gpu_video_decode_accelerator_host.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
+#include "content/public/common/content_switches.h"
 #include "gpu/command_buffer/common/cmd_buffer_common.h"
 #include "gpu/command_buffer/common/command_buffer_shared.h"
 #include "gpu/command_buffer/common/gpu_memory_allocation.h"
 #include "ui/gfx/size.h"
 
 namespace content {
 
 CommandBufferProxyImpl::CommandBufferProxyImpl(
     GpuChannelHost* channel,
     int route_id)
@@ skipping 347 matching lines @@
 
 gfx::GpuMemoryBuffer* CommandBufferProxyImpl::CreateGpuMemoryBuffer(
     size_t width,
     size_t height,
     unsigned internalformat,
     int32* id) {
   *id = -1;
 
   if (last_state_.error != gpu::error::kNoError)
     return NULL;
-
   int32 new_id = channel_->ReserveGpuMemoryBufferId();
   DCHECK(gpu_memory_buffers_.find(new_id) == gpu_memory_buffers_.end());
-
   scoped_ptr<gfx::GpuMemoryBuffer> gpu_memory_buffer(
       channel_->factory()->AllocateGpuMemoryBuffer(width,
                                                    height,
                                                    internalformat));
   if (!gpu_memory_buffer)
     return NULL;
 
   DCHECK(GpuChannelHost::IsValidGpuMemoryBuffer(
              gpu_memory_buffer->GetHandle()));
 
   // This handle is owned by the GPU process and must be passed to it or it
   // will leak. In otherwords, do not early out on error between here and the
   // sending of the RegisterGpuMemoryBuffer IPC below.
+
   gfx::GpuMemoryBufferHandle handle =
       channel_->ShareGpuMemoryBufferToGpuProcess(
           gpu_memory_buffer->GetHandle());
 
+#if defined(OS_ANDROID)
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::KEnableSurfaceTextureBuffer)) {
+    uint32 surface_texture_handle = 0;
+    uint32 texture_id = 0;
+    Send(new GpuCommandBufferMsg_CreateSurfaceTexture(
+        route_id_,
+        reinterpret_cast<uint32>(gpu_memory_buffer.get()),
+        &surface_texture_handle,
+        &texture_id));
+
+    handle.surface_texture_handle =
+        reinterpret_cast<void*>(surface_texture_handle);
+    handle.texture_id = texture_id;
+  }
+#endif

[reveman, 2014/02/26 08:02:34]

I haven't looked at what this code does in detail but this is not a good place
for platform specific code. Can this be moved to
GpuMemoryBufferImplSurfaceTexture?

+
   if (!Send(new GpuCommandBufferMsg_RegisterGpuMemoryBuffer(
                 route_id_,
                 new_id,
                 handle,
                 width,
                 height,
                 internalformat))) {
     return NULL;
   }
 
@@ skipping 175 matching lines @@
     const GpuConsoleMessageCallback& callback) {
   console_message_callback_ = callback;
 }
 
 void CommandBufferProxyImpl::TryUpdateState() {
   if (last_state_.error == gpu::error::kNoError)
     shared_state()->Read(&last_state_);
 }
 
 }  // namespace content