Add GenericSharedMemoryId and use w/ GpuMemoryBuffer

content/common/gpu/gpu_memory_buffer_factory_io_surface.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/common/gpu/gpu_memory_buffer_factory_io_surface.h"
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include <vector>
 
@@ skipping 107 matching lines @@
                                              &kCFTypeDictionaryValueCallBacks));
   AddIntegerValue(properties, kIOSurfaceWidth, size.width());
   AddIntegerValue(properties, kIOSurfaceHeight, size.height());
   AddIntegerValue(properties, kIOSurfaceBytesPerElement, BytesPerPixel(format));
   AddIntegerValue(properties, kIOSurfacePixelFormat, PixelFormat(format));
 
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface(IOSurfaceCreate(properties));
   if (!io_surface)
     return gfx::GpuMemoryBufferHandle();
 
-  if (!IOSurfaceManager::GetInstance()->RegisterIOSurface(id, client_id,
+  if (!IOSurfaceManager::GetInstance()->RegisterIOSurface(id.id, client_id,
                                                           io_surface)) {
     return gfx::GpuMemoryBufferHandle();
   }
 
   {
     base::AutoLock lock(io_surfaces_lock_);
 
-    IOSurfaceMapKey key(id, client_id);
+    IOSurfaceMapKey key(id.id, client_id);
     DCHECK(io_surfaces_.find(key) == io_surfaces_.end());
     io_surfaces_[key] = io_surface;
   }
 
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::IO_SURFACE_BUFFER;
   handle.id = id;
   return handle;
 }
 
 void GpuMemoryBufferFactoryIOSurface::DestroyGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     int client_id) {
   {
     base::AutoLock lock(io_surfaces_lock_);
 
-    IOSurfaceMapKey key(id, client_id);
+    IOSurfaceMapKey key(id.id, client_id);
     DCHECK(io_surfaces_.find(key) != io_surfaces_.end());
     io_surfaces_.erase(key);
   }
 
-  IOSurfaceManager::GetInstance()->UnregisterIOSurface(id, client_id);
+  IOSurfaceManager::GetInstance()->UnregisterIOSurface(id.id, client_id);
 }
 
 gpu::ImageFactory* GpuMemoryBufferFactoryIOSurface::AsImageFactory() {
   return this;
 }
 
 scoped_refptr<gfx::GLImage>
 GpuMemoryBufferFactoryIOSurface::CreateImageForGpuMemoryBuffer(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::BufferFormat format,
     unsigned internalformat,
     int client_id) {
   base::AutoLock lock(io_surfaces_lock_);
 
   DCHECK_EQ(handle.type, gfx::IO_SURFACE_BUFFER);
-  IOSurfaceMapKey key(handle.id, client_id);
+  IOSurfaceMapKey key(handle.id.id, client_id);
   IOSurfaceMap::iterator it = io_surfaces_.find(key);
   if (it == io_surfaces_.end())
     return scoped_refptr<gfx::GLImage>();
 
   scoped_refptr<gfx::GLImageIOSurface> image(
       new gfx::GLImageIOSurface(size, internalformat));
   if (!image->Initialize(it->second.get(), format))
     return scoped_refptr<gfx::GLImage>();
 
   return image;
 }
 
 }  // namespace content