gpu: Associate all GpuMemoryBuffers with unique IDs.

content/browser/gpu/browser_gpu_memory_buffer_manager.cc

 // Copyright 2014 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/browser/gpu/browser_gpu_memory_buffer_manager.h"
 
+#include "base/atomic_sequence_num.h"
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/lazy_instance.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread_restrictions.h"
 #include "content/common/gpu/client/gpu_memory_buffer_impl.h"
 #include "content/public/browser/browser_thread.h"
 
 namespace content {
 namespace {
 
 void GpuMemoryBufferAllocatedForChildProcess(
     const BrowserGpuMemoryBufferManager::AllocationCallback& callback,
     const gfx::GpuMemoryBufferHandle& handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   callback.Run(handle);
 }
 
 BrowserGpuMemoryBufferManager* g_gpu_memory_buffer_manager = nullptr;
 
+// Global atomic to generate gpu memory buffer unique IDs.
+base::StaticAtomicSequenceNumber g_next_gpu_memory_buffer_id;
+
 }  // namespace
 
 struct BrowserGpuMemoryBufferManager::AllocateGpuMemoryBufferRequest {
   AllocateGpuMemoryBufferRequest(const gfx::Size& size,
                                  gfx::GpuMemoryBuffer::Format format,
                                  gfx::GpuMemoryBuffer::Usage usage,
                                  int client_id)
       : event(true, false),
         size(size),
         format(format),
@@ skipping 48 matching lines @@
 void BrowserGpuMemoryBufferManager::AllocateGpuMemoryBufferForChildProcess(
     const gfx::Size& size,
     gfx::GpuMemoryBuffer::Format format,
     gfx::GpuMemoryBuffer::Usage usage,
     base::ProcessHandle child_process_handle,
     int child_client_id,
     const AllocationCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   GpuMemoryBufferImpl::AllocateForChildProcess(
+      g_next_gpu_memory_buffer_id.GetNext(),
       size,
       format,
       usage,
       child_process_handle,
       child_client_id,
       base::Bind(&GpuMemoryBufferAllocatedForChildProcess, callback));
 }
 
 gfx::GpuMemoryBuffer*
 BrowserGpuMemoryBufferManager::GpuMemoryBufferFromClientBuffer(
     ClientBuffer buffer) {
   return GpuMemoryBufferImpl::FromClientBuffer(buffer);
 }
 
 void BrowserGpuMemoryBufferManager::ChildProcessDeletedGpuMemoryBuffer(
     gfx::GpuMemoryBufferType type,
-    const gfx::GpuMemoryBufferId& id,
-    base::ProcessHandle child_process_handle) {
+    gfx::GpuMemoryBufferId id,
+    base::ProcessHandle child_process_handle,
+    int child_client_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
-  GpuMemoryBufferImpl::DeletedByChildProcess(type, id, child_process_handle);
+  GpuMemoryBufferImpl::DeletedByChildProcess(
+      type, id, child_process_handle, child_client_id);
 }
 
 void BrowserGpuMemoryBufferManager::ProcessRemoved(
     base::ProcessHandle process_handle) {
   // TODO(reveman): Handle child process removal correctly.
 }
 
 // static
 void BrowserGpuMemoryBufferManager::AllocateGpuMemoryBufferOnIO(
     AllocateGpuMemoryBufferRequest* request) {
   GpuMemoryBufferImpl::Create(
+      g_next_gpu_memory_buffer_id.GetNext(),
       request->size,
       request->format,
       request->usage,
       request->client_id,
       base::Bind(&BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO,
                  base::Unretained(request)));
 }
 
 // static
 void BrowserGpuMemoryBufferManager::GpuMemoryBufferCreatedOnIO(
     AllocateGpuMemoryBufferRequest* request,
     scoped_ptr<GpuMemoryBufferImpl> buffer) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   request->result = buffer.Pass();
   request->event.Signal();
 }
 
 }  // namespace content