gpu: Associate all GpuMemoryBuffers with unique IDs.

content/common/gpu/gpu_memory_buffer_factory_surface_texture.h

Index: content/common/gpu/gpu_memory_buffer_factory_surface_texture.h
diff --git a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h
index d0c2b928a7a439b8796d33a3054f35687a745528..c9103eda4fdef97b3e97ea38de0bc1e6a6d0837a 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h
+++ b/content/common/gpu/gpu_memory_buffer_factory_surface_texture.h
@@ -24,19 +24,20 @@ class GpuMemoryBufferFactorySurfaceTexture {
 
   // Creates a SurfaceTexture backed GPU memory buffer with |size| and
   // |internalformat|. A valid handle is returned on success.
-  gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(
-      const gfx::GpuMemoryBufferId& id,
-      const gfx::Size& size,
-      unsigned internalformat);
+  gfx::GpuMemoryBufferHandle CreateGpuMemoryBuffer(gfx::GpuMemoryBufferId id,
+                                                   const gfx::Size& size,
+                                                   unsigned internalformat,
+                                                   int client_id);
 
   // Destroy a previously created GPU memory buffer.
-  void DestroyGpuMemoryBuffer(const gfx::GpuMemoryBufferId& id);
+  void DestroyGpuMemoryBuffer(gfx::GpuMemoryBufferId id, int client_id);
 
   // Creates a GLImage instance for a GPU memory buffer.
   scoped_refptr<gfx::GLImage> CreateImageForGpuMemoryBuffer(
-      const gfx::GpuMemoryBufferId& id,
+      gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
-      unsigned internalformat);
+      unsigned internalformat,
+      int client_id);
 
  private:
   typedef std::pair<int, int> SurfaceTextureMapKey;