content: Pass IOSurface references using Mach IPC.

content/common/gpu/gpu_memory_buffer_factory_io_surface.cc

Index: content/common/gpu/gpu_memory_buffer_factory_io_surface.cc
diff --git a/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc b/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc
index f07ef78fcb5b5f8162d161b124503c718139b02c..1b6b8d0393bc8593f87ebd89304ca6eddaf5cc5a 100644
--- a/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc
+++ b/content/common/gpu/gpu_memory_buffer_factory_io_surface.cc
@@ -6,19 +6,15 @@
 
 #include <CoreFoundation/CoreFoundation.h>
 
+#include <vector>
+
 #include "base/logging.h"
+#include "content/common/mac/io_surface_manager.h"
 #include "ui/gl/gl_image_io_surface.h"
 
 namespace content {
 namespace {
 
-void AddBooleanValue(CFMutableDictionaryRef dictionary,
-                     const CFStringRef key,
-                     bool value) {
-  CFDictionaryAddValue(
-      dictionary, key, value ? kCFBooleanTrue : kCFBooleanFalse);
-}
-
 void AddIntegerValue(CFMutableDictionaryRef dictionary,
                      const CFStringRef key,
                      int32 value) {
@@ -121,14 +117,16 @@ GpuMemoryBufferFactoryIOSurface::CreateGpuMemoryBuffer(
   AddIntegerValue(properties, kIOSurfaceHeight, size.height());
   AddIntegerValue(properties, kIOSurfaceBytesPerElement, BytesPerPixel(format));
   AddIntegerValue(properties, kIOSurfacePixelFormat, PixelFormat(format));
-  // TODO(reveman): Remove this when using a mach_port_t to transfer
-  // IOSurface to browser and renderer process. crbug.com/323304
-  AddBooleanValue(properties, kIOSurfaceIsGlobal, true);
 
   base::ScopedCFTypeRef<IOSurfaceRef> io_surface(IOSurfaceCreate(properties));
   if (!io_surface)
     return gfx::GpuMemoryBufferHandle();
 
+  if (!IOSurfaceManager::GetInstance()->RegisterIOSurface(id, client_id,
+                                                          io_surface)) {
+    return gfx::GpuMemoryBufferHandle();
+  }
+
   {
     base::AutoLock lock(io_surfaces_lock_);
 
@@ -140,18 +138,21 @@ GpuMemoryBufferFactoryIOSurface::CreateGpuMemoryBuffer(
   gfx::GpuMemoryBufferHandle handle;
   handle.type = gfx::IO_SURFACE_BUFFER;
   handle.id = id;
-  handle.io_surface_id = IOSurfaceGetID(io_surface);
   return handle;
 }
 
 void GpuMemoryBufferFactoryIOSurface::DestroyGpuMemoryBuffer(
     gfx::GpuMemoryBufferId id,
     int client_id) {
-  base::AutoLock lock(io_surfaces_lock_);
+  {
+    base::AutoLock lock(io_surfaces_lock_);
+
+    IOSurfaceMapKey key(id, client_id);
+    DCHECK(io_surfaces_.find(key) != io_surfaces_.end());
+    io_surfaces_.erase(key);
+  }
 
-  IOSurfaceMapKey key(id, client_id);
-  DCHECK(io_surfaces_.find(key) != io_surfaces_.end());
-  io_surfaces_.erase(key);
+  IOSurfaceManager::GetInstance()->UnregisterIOSurface(id, client_id);
 }
 
 gpu::ImageFactory* GpuMemoryBufferFactoryIOSurface::AsImageFactory() {