Revert 113479 - Revert "Revert 113250 - Add CommandBuffer::SetGetBuffer"

ppapi/native_client/src/shared/ppapi_proxy/command_buffer_nacl.cc

 // Copyright (c) 2011 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 "native_client/src/shared/ppapi_proxy/command_buffer_nacl.h"
 
 #include <sys/mman.h>
 #include "gpu/command_buffer/common/logging.h"
 #include "native_client/src/shared/ppapi_proxy/plugin_globals.h"
 #include "native_client/src/shared/ppapi_proxy/utility.h"
 #include "ppapi/c/ppb_core.h"
 
 #include "srpcgen/ppb_rpc.h"
 
 using ppapi_proxy::DebugPrintf;
 
 CommandBufferNacl::CommandBufferNacl(PP_Resource graphics_3d,
                                      const PPB_Core* iface_core)
     : graphics_3d_(graphics_3d), iface_core_(iface_core) {
   iface_core_->AddRefResource(graphics_3d_);
 }
 
 CommandBufferNacl::~CommandBufferNacl() {
   DebugPrintf("CommandBufferNacl::~CommandBufferNacl()\n");
   iface_core_->ReleaseResource(graphics_3d_);
 }
 
-bool CommandBufferNacl::Initialize() {
+bool CommandBufferNacl::Initialize(int32 size) {
   DebugPrintf("CommandBufferNacl::Initialize\n");
   int32_t success;
   NaClSrpcChannel* channel = ppapi_proxy::GetMainSrpcChannel();
   NaClSrpcError retval =
       PpbGraphics3DRpcClient::PPB_Graphics3DTrusted_InitCommandBuffer(
-          channel, graphics_3d_, &success);
+          channel, graphics_3d_, size, &success);
   DebugPrintf("CommandBufferNaCl::Initialize returned success=%s\n",
       (PP_TRUE == success) ? "TRUE" : "FALSE");
   return NACL_SRPC_RESULT_OK == retval && PP_TRUE == success;
 }
 
+gpu::Buffer CommandBufferNacl::GetRingBuffer() {
+  DebugPrintf("CommandBufferNacl::GetRingBuffer\n");
+  if (!buffer_.ptr) {
+    DebugPrintf("CommandBufferNacl::GetRingBuffer: Fetching\n");
+    int shm_handle = -1;
+    int32_t shm_size = 0;
+
+    NaClSrpcChannel* channel = ppapi_proxy::GetMainSrpcChannel();
+    NaClSrpcError retval =
+        PpbGraphics3DRpcClient::PPB_Graphics3DTrusted_GetRingBuffer(
+            channel, graphics_3d_, &shm_handle, &shm_size);
+    if (NACL_SRPC_RESULT_OK != retval) {
+      shm_handle = -1;
+    }
+    buffer_ = BufferFromShm(shm_handle, shm_size);
+  }
+
+  return buffer_;
+}
+
 gpu::CommandBuffer::State CommandBufferNacl::GetState() {
   DebugPrintf("CommandBufferNacl::GetState\n");
   PP_Graphics3DTrustedState state;
   nacl_abi_size_t state_size = static_cast<nacl_abi_size_t>(sizeof(state));
 
   NaClSrpcChannel* channel = ppapi_proxy::GetMainSrpcChannel();
   NaClSrpcError retval =
       PpbGraphics3DRpcClient::PPB_Graphics3DTrusted_GetState(
           channel, graphics_3d_, &state_size, reinterpret_cast<char*>(&state));
   if (NACL_SRPC_RESULT_OK != retval
@@ skipping 33 matching lines @@
           reinterpret_cast<char*>(&state));
   if (NACL_SRPC_RESULT_OK != retval
       || state_size != static_cast<nacl_abi_size_t>(sizeof(state))) {
     return ErrorGpuState();
   }
 
   last_state_ = PpapiToGpuState(state);
   return last_state_;
 }
 
-void CommandBufferNacl::SetGetBuffer(int32 transfer_buffer_id) {
-  DebugPrintf("CommandBufferNacl::SetGetBuffer\n");
-  NaClSrpcChannel* channel = ppapi_proxy::GetMainSrpcChannel();
-  PpbGraphics3DRpcClient::PPB_Graphics3DTrusted_SetGetBuffer(
-      channel, graphics_3d_, transfer_buffer_id);
-}
-
 void CommandBufferNacl::SetGetOffset(int32 get_offset) {
   DebugPrintf("CommandBufferNacl::SetGetOffset\n");
   // Not implemented by proxy.
   GPU_NOTREACHED();
 }
 
 int32 CommandBufferNacl::CreateTransferBuffer(size_t size, int32 id_request) {
   DebugPrintf("CommandBufferNacl::CreateTransferBuffer\n");
   int32_t id;
 
@@ skipping 75 matching lines @@
 gpu::CommandBuffer::State CommandBufferNacl::PpapiToGpuState(
     PP_Graphics3DTrustedState s) {
   gpu::CommandBuffer::State state;
   state.num_entries = s.num_entries;
   state.get_offset  = s.get_offset;
   state.put_offset  = s.put_offset;
   state.token       = s.token;
   state.error       = static_cast<gpu::error::Error>(s.error);
   return state;
 }