Add GenericSharedMemoryId and use w/ GpuMemoryBuffer

content/browser/gpu/browser_gpu_memory_buffer_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 #define CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_
 
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 34 matching lines @@
   bool OnMemoryDump(const base::trace_event::MemoryDumpArgs& args,
                     base::trace_event::ProcessMemoryDump* pmd) override;
 
   // Virtual for testing.
   virtual scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForScanout(
       const gfx::Size& size,
       gfx::BufferFormat format,
       int32 surface_id);
 
   void AllocateGpuMemoryBufferForChildProcess(
+      gfx::GpuMemoryBufferId id,
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       base::ProcessHandle child_process_handle,
       int child_client_id,
       const AllocationCallback& callback);
   void ChildProcessDeletedGpuMemoryBuffer(
       gfx::GpuMemoryBufferId id,
       base::ProcessHandle child_process_handle,
       int child_client_id,
@@ skipping 18 matching lines @@
           usage(usage),
           gpu_host_id(gpu_host_id) {}
 
     gfx::Size size;
     gfx::GpuMemoryBufferType type;
     gfx::BufferFormat format;
     gfx::BufferUsage usage;
     int gpu_host_id;
   };
   struct AllocateGpuMemoryBufferRequest;
+  using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
+  using ClientMap = base::hash_map<int, BufferMap>;
 
   scoped_ptr<gfx::GpuMemoryBuffer> AllocateGpuMemoryBufferForSurface(
       const gfx::Size& size,
       gfx::BufferFormat format,
       gfx::BufferUsage usage,
       int32 surface_id);
   bool IsGpuMemoryBufferConfigurationSupported(gfx::BufferFormat format,
                                                gfx::BufferUsage usage) const;
   void AllocateGpuMemoryBufferForSurfaceOnIO(
       AllocateGpuMemoryBufferRequest* request);
@@ skipping 14 matching lines @@
                                     int gpu_host_id,
                                     bool reused_gpu_process,
                                     const AllocationCallback& callback,
                                     const gfx::GpuMemoryBufferHandle& handle);
   void DestroyGpuMemoryBufferOnIO(gfx::GpuMemoryBufferId id,
                                   int client_id,
                                   uint32 sync_point);
 
   uint64_t ClientIdToTracingProcessId(int client_id) const;
 
+  // Helper that tries to add a new buffer to the map and returns false if not
+  // possible (because an element with the same id already existed).
+  bool TryAddNewBufferToMap(BufferMap& buffers,
+                            int id,
+                            const BufferInfo& buffer_info);
+
   const gfx::GpuMemoryBufferType factory_type_;
   const std::vector<GpuMemoryBufferFactory::Configuration>
       supported_configurations_;
   const int gpu_client_id_;
   const uint64_t gpu_client_tracing_id_;
 
   // The GPU process host ID. This should only be accessed on the IO thread.
   int gpu_host_id_;
 
   // Stores info about buffers for all clients. This should only be accessed
   // on the IO thread.
-  using BufferMap = base::hash_map<gfx::GpuMemoryBufferId, BufferInfo>;
-  using ClientMap = base::hash_map<int, BufferMap>;
   ClientMap clients_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserGpuMemoryBufferManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_GPU_BROWSER_GPU_MEMORY_BUFFER_MANAGER_H_