| Index: content/renderer/pepper/ppb_graphics_3d_impl.cc
|
| diff --git a/content/renderer/pepper/ppb_graphics_3d_impl.cc b/content/renderer/pepper/ppb_graphics_3d_impl.cc
|
| index 2f715b46a5309a1a76a90c9ae48241bb7eb81b3d..33087c0737485a983fce9234eefe5927c5230415 100644
|
| --- a/content/renderer/pepper/ppb_graphics_3d_impl.cc
|
| +++ b/content/renderer/pepper/ppb_graphics_3d_impl.cc
|
| @@ -80,7 +80,8 @@ PP_Resource PPB_Graphics3D_Impl::CreateRaw(
|
| PP_Resource share_context,
|
| const int32_t* attrib_list,
|
| gpu::Capabilities* capabilities,
|
| - base::SharedMemoryHandle* shared_state_handle) {
|
| + base::SharedMemoryHandle* shared_state_handle,
|
| + uint64_t* command_buffer_id) {
|
| PPB_Graphics3D_API* share_api = NULL;
|
| if (share_context) {
|
| EnterResourceNoLock<PPB_Graphics3D_API> enter(share_context, true);
|
| @@ -91,7 +92,7 @@ PP_Resource PPB_Graphics3D_Impl::CreateRaw(
|
| scoped_refptr<PPB_Graphics3D_Impl> graphics_3d(
|
| new PPB_Graphics3D_Impl(instance));
|
| if (!graphics_3d->InitRaw(share_api, attrib_list, capabilities,
|
| - shared_state_handle))
|
| + shared_state_handle, command_buffer_id))
|
| return 0;
|
| return graphics_3d->GetReference();
|
| }
|
| @@ -205,7 +206,7 @@ int32 PPB_Graphics3D_Impl::DoSwapBuffers() {
|
|
|
| bool PPB_Graphics3D_Impl::Init(PPB_Graphics3D_API* share_context,
|
| const int32_t* attrib_list) {
|
| - if (!InitRaw(share_context, attrib_list, NULL, NULL))
|
| + if (!InitRaw(share_context, attrib_list, NULL, NULL, NULL))
|
| return false;
|
|
|
| gpu::gles2::GLES2Implementation* share_gles2 = NULL;
|
| @@ -221,7 +222,8 @@ bool PPB_Graphics3D_Impl::InitRaw(
|
| PPB_Graphics3D_API* share_context,
|
| const int32_t* attrib_list,
|
| gpu::Capabilities* capabilities,
|
| - base::SharedMemoryHandle* shared_state_handle) {
|
| + base::SharedMemoryHandle* shared_state_handle,
|
| + uint64_t* command_buffer_id) {
|
| PepperPluginInstanceImpl* plugin_instance =
|
| HostGlobals::Get()->GetInstance(pp_instance());
|
| if (!plugin_instance)
|
| @@ -301,6 +303,8 @@ bool PPB_Graphics3D_Impl::InitRaw(
|
| *shared_state_handle = command_buffer_->GetSharedStateHandle();
|
| if (capabilities)
|
| *capabilities = command_buffer_->GetCapabilities();
|
| + if (command_buffer_id)
|
| + *command_buffer_id = command_buffer_->GetCommandBufferID();
|
| mailbox_ = gpu::Mailbox::Generate();
|
| if (!command_buffer_->ProduceFrontBuffer(mailbox_))
|
| return false;
|
|
|