gpu: Associate all GpuMemoryBuffers with unique IDs.

content/common/gpu/client/gpu_memory_buffer_impl.h

Index: content/common/gpu/client/gpu_memory_buffer_impl.h
diff --git a/content/common/gpu/client/gpu_memory_buffer_impl.h b/content/common/gpu/client/gpu_memory_buffer_impl.h
index 727e54125adc5f952bebb447100ed944c6aa42c6..6f8e24d75cb9d84953a1b29e9cb75e826dd43223 100644
--- a/content/common/gpu/client/gpu_memory_buffer_impl.h
+++ b/content/common/gpu/client/gpu_memory_buffer_impl.h
@@ -25,7 +25,8 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
 
   // Creates a GPU memory buffer instance with |size| and |format| for |usage|
   // by the current process and |client_id|.
-  static void Create(const gfx::Size& size,
+  static void Create(gfx::GpuMemoryBufferId id,
+                     const gfx::Size& size,
                      Format format,
                      Usage usage,
                      int client_id,
@@ -34,7 +35,8 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   // Allocates a GPU memory buffer with |size| and |internalformat| for |usage|
   // by |child_process| and |child_client_id|. The |handle| returned can be
   // used by the |child_process| to create an instance of this class.
-  static void AllocateForChildProcess(const gfx::Size& size,
+  static void AllocateForChildProcess(gfx::GpuMemoryBufferId id,
+                                      const gfx::Size& size,
                                       Format format,
                                       Usage usage,
                                       base::ProcessHandle child_process,
@@ -43,8 +45,9 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
 
   // Notify that GPU memory buffer has been deleted by |child_process|.
   static void DeletedByChildProcess(gfx::GpuMemoryBufferType type,
-                                    const gfx::GpuMemoryBufferId& id,
-                                    base::ProcessHandle child_process);
+                                    gfx::GpuMemoryBufferId id,
+                                    base::ProcessHandle child_process,
+                                    int child_client_id);
 
   // Creates an instance from the given |handle|. |size| and |internalformat|
   // should match what was used to allocate the |handle|. |callback| is
@@ -69,10 +72,12 @@ class GpuMemoryBufferImpl : public gfx::GpuMemoryBuffer {
   ClientBuffer AsClientBuffer() override;
 
  protected:
-  GpuMemoryBufferImpl(const gfx::Size& size,
+  GpuMemoryBufferImpl(gfx::GpuMemoryBufferId id,
+                      const gfx::Size& size,
                       Format format,
                       const DestructionCallback& callback);
 
+  const gfx::GpuMemoryBufferId id_;
   const gfx::Size size_;
   const Format format_;
   const DestructionCallback callback_;