[Pepper GL] Use shared state to fix a memory leak in MapSub GL extension.

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 "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"
@@ skipping 10 matching lines @@
 using ppapi::thunk::ResourceCreationAPI;
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
 const int32 kCommandBufferSize = 1024 * 1024;
 const int32 kTransferBufferSize = 1024 * 1024;
 
-base::SharedMemoryHandle TransportSHMHandle(Dispatcher* dispatcher,
-                                            base::SharedMemory* shm) {
-  base::PlatformFile source =
-      IPC::PlatformFileForTransitToPlatformFile(shm->handle());
+base::SharedMemoryHandle TransportSHMHandle(
+    Dispatcher* dispatcher,
+    const base::SharedMemoryHandle& handle) {
+  base::PlatformFile source = IPC::PlatformFileForTransitToPlatformFile(handle);
   // Don't close the handle, it doesn't belong to us.
   return dispatcher->ShareHandleWithRemote(source, false);
 }
 
 gpu::CommandBuffer::State GetErrorState() {
   gpu::CommandBuffer::State error_state;
   error_state.error = gpu::error::kGenericError;
   return error_state;
 }
 
 }  // namespace
 
 Graphics3D::Graphics3D(const HostResource& resource)
     : PPB_Graphics3D_Shared(resource) {
 }
 
 Graphics3D::~Graphics3D() {
   DestroyGLES2Impl();
 }
 
-bool Graphics3D::Init(gpu::gles2::GLES2Implementation* share_gles2) {
+bool Graphics3D::Init(gpu::gles2::GLES2Implementation* share_gles2,
+                      const SerializedHandle& shared_state) {
   PluginDispatcher* dispatcher = PluginDispatcher::GetForResource(this);
   if (!dispatcher)
     return false;
 
   command_buffer_.reset(
-      new PpapiCommandBufferProxy(host_resource(), dispatcher));
+      new PpapiCommandBufferProxy(host_resource(), dispatcher, shared_state));
 
   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 88 matching lines @@
     for (const int32_t* attr = attrib_list;
          attr[0] != PP_GRAPHICS3DATTRIB_NONE;
          attr += 2) {
       attribs.push_back(attr[0]);
       attribs.push_back(attr[1]);
     }
   }
   attribs.push_back(PP_GRAPHICS3DATTRIB_NONE);
 
   HostResource result;
-  dispatcher->Send(new PpapiHostMsg_PPBGraphics3D_Create(
-      API_ID_PPB_GRAPHICS_3D, instance, share_host, attribs, &result));
+  ppapi::proxy::SerializedHandle shared_state;
+  //(
+  //    ppapi::proxy::SerializedHandle::SHARED_MEMORY);

[piman, 2014/09/08 21:02:04]

nit: bogus comment?

[Peng, 2014/09/08 21:12:22]

Done.

+  dispatcher->Send(new PpapiHostMsg_PPBGraphics3D_Create(API_ID_PPB_GRAPHICS_3D,
+        instance, share_host, attribs, &result, &shared_state));
+
   if (result.is_null())
     return 0;
 
   scoped_refptr<Graphics3D> graphics_3d(new Graphics3D(result));
-  if (!graphics_3d->Init(share_gles2))
+  if (!graphics_3d->Init(share_gles2, shared_state))
     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)
@@ skipping 24 matching lines @@
 
   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) {
+                                       HostResource* result,
+                                       SerializedHandle* shared_state) {
+  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()) {
-    result->SetHostResource(
+  if (!enter.succeeded())
+    return;
+
+  base::SharedMemoryHandle handle = IPC::InvalidPlatformFileForTransit();
+  result->SetHostResource(
       instance,
       enter.functions()->CreateGraphics3DRaw(instance,
                                              share_context.host_resource(),
-                                             &attribs.front()));
+                                             &attribs.front(),
+                                             &handle));
+  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);
   if (enter.succeeded())
     enter.object()->SetGetBuffer(transfer_buffer_id);
 }
@@ skipping 32 matching lines @@
                                            int32 put_offset) {
   EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
   if (enter.succeeded())
     enter.object()->Flush(put_offset);
 }
 
 void PPB_Graphics3D_Proxy::OnMsgCreateTransferBuffer(
     const HostResource& context,
     uint32 size,
     int32* id,
-    ppapi::proxy::SerializedHandle* transfer_buffer) {
+    SerializedHandle* transfer_buffer) {
   transfer_buffer->set_null_shmem();
   EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
   if (enter.succeeded()) {
     scoped_refptr<gpu::Buffer> buffer =
         enter.object()->CreateTransferBuffer(size, id);
     if (!buffer.get())
       return;
     gpu::SharedMemoryBufferBacking* backing =
         static_cast<gpu::SharedMemoryBufferBacking*>(buffer->backing());
     DCHECK(backing && backing->shared_memory());
     transfer_buffer->set_shmem(
-        TransportSHMHandle(dispatcher(), backing->shared_memory()),
+        TransportSHMHandle(dispatcher(), backing->shared_memory()->handle()),
         buffer->size());
   } else {
     *id = -1;
   }
 }
 
 void PPB_Graphics3D_Proxy::OnMsgDestroyTransferBuffer(
     const HostResource& context,
     int32 id) {
   EnterHostFromHostResource<PPB_Graphics3D_API> enter(context);
@@ skipping 46 matching lines @@
     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