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

webkit/plugins/ppapi/ppb_graphics_3d_impl.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 "webkit/plugins/ppapi/ppb_graphics_3d_impl.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "webkit/plugins/ppapi/plugin_module.h"
@@ skipping 69 matching lines @@
       new PPB_Graphics3D_Impl(instance));
   if (!graphics_3d->InitRaw(share_context, attrib_list))
     return 0;
   return graphics_3d->GetReference();
 }
 
 PPB_Graphics3D_API* PPB_Graphics3D_Impl::AsPPB_Graphics3D_API() {
   return this;
 }
 
-PP_Bool PPB_Graphics3D_Impl::InitCommandBuffer() {
-  return PP_FromBool(GetCommandBuffer()->Initialize());
+PP_Bool PPB_Graphics3D_Impl::InitCommandBuffer(int32_t size) {
+  return PP_FromBool(GetCommandBuffer()->Initialize(size));
 }
 
-PP_Bool PPB_Graphics3D_Impl::SetGetBuffer(int32_t transfer_buffer_id) {
-  GetCommandBuffer()->SetGetBuffer(transfer_buffer_id);
-  return PP_TRUE;
+PP_Bool PPB_Graphics3D_Impl::GetRingBuffer(int* shm_handle,
+                                           uint32_t* shm_size) {
+  gpu::Buffer buffer = GetCommandBuffer()->GetRingBuffer();
+  return ShmToHandle(buffer.shared_memory, buffer.size, shm_handle, shm_size);
 }
 
 PP_Graphics3DTrustedState PPB_Graphics3D_Impl::GetState() {
   return PPStateFromGPUState(GetCommandBuffer()->GetState());
 }
 
 int32_t PPB_Graphics3D_Impl::CreateTransferBuffer(uint32_t size) {
   return GetCommandBuffer()->CreateTransferBuffer(size, -1);
 }
 
@@ skipping 76 matching lines @@
 
   return PP_OK_COMPLETIONPENDING;
 }
 
 bool PPB_Graphics3D_Impl::Init(PP_Resource share_context,
                                const int32_t* attrib_list) {
   if (!InitRaw(share_context, attrib_list))
     return false;
 
   gpu::CommandBuffer* command_buffer = GetCommandBuffer();
-  if (!command_buffer->Initialize())
+  if (!command_buffer->Initialize(kCommandBufferSize))
     return false;
 
   return CreateGLES2Impl(kCommandBufferSize, kTransferBufferSize);
 }
 
 bool PPB_Graphics3D_Impl::InitRaw(PP_Resource share_context,
                                   const int32_t* attrib_list) {
   PluginInstance* plugin_instance = ResourceHelper::GetPluginInstance(this);
   if (!plugin_instance)
     return false;
@@ skipping 48 matching lines @@
   const PPP_Graphics3D* ppp_graphics_3d =
       static_cast<const PPP_Graphics3D*>(
           instance->module()->GetPluginInterface(
               PPP_GRAPHICS_3D_INTERFACE));
   if (ppp_graphics_3d)
     ppp_graphics_3d->Graphics3DContextLost(pp_instance());
 }
 
 }  // namespace ppapi
 }  // namespace webkit