Added a unique command buffer ID for command buffers.

ppapi/proxy/ppb_graphics_3d_proxy.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 "ppapi/proxy/ppb_graphics_3d_proxy.h"
 
 #include "base/numerics/safe_conversions.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/common/command_buffer.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/proxy/enter_proxy.h"
 #include "ppapi/proxy/plugin_dispatcher.h"
 #include "ppapi/proxy/ppapi_command_buffer_proxy.h"
 #include "ppapi/proxy/ppapi_messages.h"
+#include "ppapi/shared_impl/command_buffer_id_pair.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/resource_creation_api.h"
 #include "ppapi/thunk/thunk.h"
 
 using ppapi::thunk::EnterResourceNoLock;
 using ppapi::thunk::PPB_Graphics3D_API;
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace ppapi {
@@ skipping 24 matching lines @@
 Graphics3D::Graphics3D(const HostResource& resource)
     : PPB_Graphics3D_Shared(resource) {
 }
 
 Graphics3D::~Graphics3D() {
   DestroyGLES2Impl();
 }
 
 bool Graphics3D::Init(gpu::gles2::GLES2Implementation* share_gles2,
                       const gpu::Capabilities& capabilities,
-                      const SerializedHandle& shared_state) {
+                      const SerializedHandle& shared_state,
+                      gpu::CommandBufferNamespace namespace_id,
+                      uint64_t command_buffer_id) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForResource(this);
   if (!dispatcher)
     return false;
 
   command_buffer_.reset(new PpapiCommandBufferProxy(
-      host_resource(), dispatcher, capabilities, shared_state));
+      host_resource(), dispatcher, capabilities, shared_state,
+      namespace_id, command_buffer_id));
 
   return CreateGLES2Impl(kCommandBufferSize, kTransferBufferSize,
                          share_gles2);
 }
 
 PP_Bool Graphics3D::SetGetBuffer(int32_t /* transfer_buffer_id */) {
   return PP_FALSE;
 }
 
 PP_Bool Graphics3D::Flush(int32_t put_offset) {
@@ skipping 90 matching lines @@
          attr += 2) {
       attribs.push_back(attr[0]);
       attribs.push_back(attr[1]);
     }
   }
   attribs.push_back(PP_GRAPHICS3DATTRIB_NONE);
 
   HostResource result;
   gpu::Capabilities capabilities;
   ppapi::proxy::SerializedHandle shared_state;
+  CommandBufferIDPair id_pair;
   dispatcher->Send(new PpapiHostMsg_PPBGraphics3D_Create(API_ID_PPB_GRAPHICS_3D,
-        instance, share_host, attribs, &result, &capabilities, &shared_state));
+        instance, share_host, attribs, &result, &capabilities, &shared_state,
+        &id_pair));
 
   if (result.is_null())
     return 0;
 
   scoped_refptr<Graphics3D> graphics_3d(new Graphics3D(result));
-  if (!graphics_3d->Init(share_gles2, capabilities, shared_state))
+  if (!graphics_3d->Init(share_gles2, capabilities, shared_state,
+                         id_pair.namespace_id, id_pair.command_buffer_id)) {
     return 0;
+  }
   return graphics_3d->GetReference();
 }
 
 bool PPB_Graphics3D_Proxy::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(PPB_Graphics3D_Proxy, msg)
 #if !defined(OS_NACL)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_Create,
                         OnMsgCreate)
     IPC_MESSAGE_HANDLER(PpapiHostMsg_PPBGraphics3D_SetGetBuffer,
@@ skipping 20 matching lines @@
     IPC_MESSAGE_HANDLER(PpapiMsg_PPBGraphics3D_SwapBuffersACK,
                         OnMsgSwapBuffersACK)
     IPC_MESSAGE_UNHANDLED(handled = false)
 
   IPC_END_MESSAGE_MAP()
   // FIXME(brettw) handle bad messages!
   return handled;
 }
 
 #if !defined(OS_NACL)
-void PPB_Graphics3D_Proxy::OnMsgCreate(PP_Instance instance,
-                                       HostResource share_context,
-                                       const std::vector<int32_t>& attribs,
-                                       HostResource* result,
-                                       gpu::Capabilities* capabilities,
-                                       SerializedHandle* shared_state) {
+void PPB_Graphics3D_Proxy::OnMsgCreate(
+    PP_Instance instance,
+    HostResource share_context,
+    const std::vector<int32_t>& attribs,
+    HostResource* result,
+    gpu::Capabilities* capabilities,
+    SerializedHandle* shared_state,
+    CommandBufferIDPair* id_pair) {
   shared_state->set_null_shmem();
   if (attribs.empty() ||
       attribs.back() != PP_GRAPHICS3DATTRIB_NONE ||
       !(attribs.size() & 1))
     return;  // Bad message.
 
   thunk::EnterResourceCreation enter(instance);
 
   if (!enter.succeeded())
     return;
 
   base::SharedMemoryHandle handle = base::SharedMemory::NULLHandle();
   result->SetHostResource(
       instance,
       enter.functions()->CreateGraphics3DRaw(instance,
                                              share_context.host_resource(),
                                              &attribs.front(),
                                              capabilities,
-                                             &handle));
+                                             &handle,
+                                             id_pair));
   if (!result->is_null()) {
     shared_state->set_shmem(TransportSHMHandle(dispatcher(), handle),
                             sizeof(gpu::CommandBuffer::State));
   }
 }
 
 void PPB_Graphics3D_Proxy::OnMsgSetGetBuffer(
     const HostResource& context,
     int32 transfer_buffer_id) {
   EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
@@ skipping 113 matching lines @@
 void PPB_Graphics3D_Proxy::SendSwapBuffersACKToPlugin(
     int32_t result,
     const HostResource& context) {
   dispatcher()->Send(new PpapiMsg_PPBGraphics3D_SwapBuffersACK(
       API_ID_PPB_GRAPHICS_3D, context, result));
 }
 #endif  // !defined(OS_NACL)
 
 }  // namespace proxy
 }  // namespace ppapi