gpu: Associate all GpuMemoryBuffers with unique IDs.

content/common/gpu/client/gpu_memory_buffer_impl_mac.cc

Index: content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc b/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
index e0fe58da0e9ff250f638ef491408b9da9b1598df..1fa29206d7e0d0596b41322620c14c6ac4b13f73 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
+++ b/content/common/gpu/client/gpu_memory_buffer_impl_mac.cc
@@ -10,19 +10,20 @@
 namespace content {
 
 // static
-void GpuMemoryBufferImpl::Create(const gfx::Size& size,
+void GpuMemoryBufferImpl::Create(gfx::GpuMemoryBufferId id,
+                                 const gfx::Size& size,
                                  Format format,
                                  Usage usage,
                                  int client_id,
                                  const CreationCallback& callback) {
   if (GpuMemoryBufferImplIOSurface::IsConfigurationSupported(format, usage)) {
-    GpuMemoryBufferImplIOSurface::Create(size, format, client_id, callback);
+    GpuMemoryBufferImplIOSurface::Create(id, size, format, client_id, callback);
     return;
   }
 
   if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
           size, format, usage)) {
-    GpuMemoryBufferImplSharedMemory::Create(size, format, callback);
+    GpuMemoryBufferImplSharedMemory::Create(id, size, format, callback);
     return;
   }
 
@@ -31,6 +32,7 @@ void GpuMemoryBufferImpl::Create(const gfx::Size& size,
 
 // static
 void GpuMemoryBufferImpl::AllocateForChildProcess(
+    gfx::GpuMemoryBufferId id,
     const gfx::Size& size,
     Format format,
     Usage usage,
@@ -39,14 +41,14 @@ void GpuMemoryBufferImpl::AllocateForChildProcess(
     const AllocationCallback& callback) {
   if (GpuMemoryBufferImplIOSurface::IsConfigurationSupported(format, usage)) {
     GpuMemoryBufferImplIOSurface::AllocateForChildProcess(
-        size, format, child_client_id, callback);
+        id, size, format, child_client_id, callback);
     return;
   }
 
   if (GpuMemoryBufferImplSharedMemory::IsConfigurationSupported(
           size, format, usage)) {
     GpuMemoryBufferImplSharedMemory::AllocateForChildProcess(
-        size, format, child_process, callback);
+        id, size, format, child_process, callback);
     return;
   }
 
@@ -56,8 +58,9 @@ void GpuMemoryBufferImpl::AllocateForChildProcess(
 // static
 void GpuMemoryBufferImpl::DeletedByChildProcess(
     gfx::GpuMemoryBufferType type,
-    const gfx::GpuMemoryBufferId& id,
-    base::ProcessHandle child_process) {
+    gfx::GpuMemoryBufferId id,
+    base::ProcessHandle child_process,
+    int child_client_id) {
 }
 
 // static