gpu: Associate all GpuMemoryBuffers with unique IDs.

content/common/gpu/client/gpu_memory_buffer_impl_io_surface.cc

 // Copyright 2013 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 "content/common/gpu/client/gpu_memory_buffer_impl_io_surface.h"
 
-#include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "content/common/gpu/client/gpu_memory_buffer_factory_host.h"
 #include "ui/gl/gl_bindings.h"
 
 namespace content {
 namespace {
 
-base::StaticAtomicSequenceNumber g_next_buffer_id;
-
-void GpuMemoryBufferDeleted(const gfx::GpuMemoryBufferHandle& handle,
+void GpuMemoryBufferDeleted(gfx::GpuMemoryBufferId id,
+                            int client_id,
                             uint32 sync_point) {
-  GpuMemoryBufferFactoryHost::GetInstance()->DestroyGpuMemoryBuffer(handle,
-                                                                    sync_point);
+  GpuMemoryBufferFactoryHost::GetInstance()->DestroyGpuMemoryBuffer(
+      gfx::IO_SURFACE_BUFFER, id, client_id, sync_point);
 }
 
 void GpuMemoryBufferCreated(
     const gfx::Size& size,
     gfx::GpuMemoryBuffer::Format format,
+    int client_id,
     const GpuMemoryBufferImpl::CreationCallback& callback,
     const gfx::GpuMemoryBufferHandle& handle) {
   DCHECK_EQ(gfx::IO_SURFACE_BUFFER, handle.type);
 
   callback.Run(GpuMemoryBufferImplIOSurface::CreateFromHandle(
-      handle, size, format, base::Bind(&GpuMemoryBufferDeleted, handle)));
+      handle,
+      size,
+      format,
+      base::Bind(&GpuMemoryBufferDeleted, handle.id, client_id)));
 }
 
 void GpuMemoryBufferCreatedForChildProcess(
     const GpuMemoryBufferImpl::AllocationCallback& callback,
     const gfx::GpuMemoryBufferHandle& handle) {
   DCHECK_EQ(gfx::IO_SURFACE_BUFFER, handle.type);
 
   callback.Run(handle);
 }
 
 }  // namespace
 
 GpuMemoryBufferImplIOSurface::GpuMemoryBufferImplIOSurface(
+    gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     Format format,
     const DestructionCallback& callback,
     IOSurfaceRef io_surface)
-    : GpuMemoryBufferImpl(size, format, callback), io_surface_(io_surface) {
+    : GpuMemoryBufferImpl(id, size, format, callback), io_surface_(io_surface) {
 }
 
 GpuMemoryBufferImplIOSurface::~GpuMemoryBufferImplIOSurface() {
 }
 
 // static
-void GpuMemoryBufferImplIOSurface::Create(const gfx::Size& size,
+void GpuMemoryBufferImplIOSurface::Create(gfx::GpuMemoryBufferId id,
+                                          const gfx::Size& size,
                                           Format format,
                                           int client_id,
                                           const CreationCallback& callback) {
-  gfx::GpuMemoryBufferHandle handle;
-  handle.type = gfx::IO_SURFACE_BUFFER;
-  handle.global_id.primary_id = g_next_buffer_id.GetNext();
-  handle.global_id.secondary_id = client_id;
   GpuMemoryBufferFactoryHost::GetInstance()->CreateGpuMemoryBuffer(
-      handle,
+      gfx::IO_SURFACE_BUFFER,
+      id,
       size,
       format,
       MAP,
-      base::Bind(&GpuMemoryBufferCreated, size, format, callback));
+      client_id,
+      base::Bind(&GpuMemoryBufferCreated, size, format, client_id, callback));
 }
 
 // static
 void GpuMemoryBufferImplIOSurface::AllocateForChildProcess(
+    gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     Format format,
     int child_client_id,
     const AllocationCallback& callback) {
-  gfx::GpuMemoryBufferHandle handle;
-  handle.type = gfx::IO_SURFACE_BUFFER;
-  handle.global_id.primary_id = g_next_buffer_id.GetNext();
-  handle.global_id.secondary_id = child_client_id;
   GpuMemoryBufferFactoryHost::GetInstance()->CreateGpuMemoryBuffer(
-      handle,
+      gfx::IO_SURFACE_BUFFER,
+      id,
       size,
       format,
       MAP,
+      child_client_id,
       base::Bind(&GpuMemoryBufferCreatedForChildProcess, callback));
 }
 
 // static
 scoped_ptr<GpuMemoryBufferImpl> GpuMemoryBufferImplIOSurface::CreateFromHandle(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     Format format,
     const DestructionCallback& callback) {
   DCHECK(IsFormatSupported(format));
 
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface(
       IOSurfaceLookup(handle.io_surface_id));
   if (!io_surface)
     return scoped_ptr<GpuMemoryBufferImpl>();
 
   return make_scoped_ptr<GpuMemoryBufferImpl>(new GpuMemoryBufferImplIOSurface(
-      size, format, callback, io_surface.get()));
-}
-
-void GpuMemoryBufferImplIOSurface::DeletedByChildProcess(
-    const gfx::GpuMemoryBufferId& id,
-    uint32_t sync_point) {
-  gfx::GpuMemoryBufferHandle handle;
-  handle.type = gfx::IO_SURFACE_BUFFER;
-  handle.global_id = id;
-  GpuMemoryBufferFactoryHost::GetInstance()->DestroyGpuMemoryBuffer(handle,
-                                                                    sync_point);
+      handle.id, size, format, callback, io_surface.get()));
 }
 
 // static
+void GpuMemoryBufferImplIOSurface::DeletedByChildProcess(
+    gfx::GpuMemoryBufferId id,
+    int child_client_id,
+    uint32_t sync_point) {
+  GpuMemoryBufferFactoryHost::GetInstance()->DestroyGpuMemoryBuffer(
+      gfx::IO_SURFACE_BUFFER, id, child_client_id, sync_point);
+}
+
+// static
 bool GpuMemoryBufferImplIOSurface::IsFormatSupported(Format format) {
   switch (format) {
     case BGRA_8888:
       return true;
     case RGBA_8888:
     case RGBX_8888:
       return false;
   }
 
   NOTREACHED();
@@ skipping 47 matching lines @@
   mapped_ = false;
 }
 
 uint32 GpuMemoryBufferImplIOSurface::GetStride() const {
   return IOSurfaceGetBytesPerRow(io_surface_);
 }
 
 gfx::GpuMemoryBufferHandle GpuMemoryBufferImplIOSurface::GetHandle() const {
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::IO_SURFACE_BUFFER;
+  handle.id = id_;
   handle.io_surface_id = IOSurfaceGetID(io_surface_);
   return handle;
 }
 
 }  // namespace content