content: Pass IOSurface references using Mach IPC.

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 "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) {
   base::ScopedCFTypeRef<CFNumberRef> number(
       CFNumberCreate(NULL, kCFNumberSInt32Type, &value));
   CFDictionaryAddValue(dictionary, key, number.get());
 }
 
 int32 BytesPerPixel(gfx::GpuMemoryBuffer::Format format) {
   switch (format) {
@@ skipping 78 matching lines @@
     gfx::PluginWindowHandle surface_handle) {
   base::ScopedCFTypeRef<CFMutableDictionaryRef> properties;
   properties.reset(CFDictionaryCreateMutable(kCFAllocatorDefault,
                                              0,
                                              &kCFTypeDictionaryKeyCallBacks,
                                              &kCFTypeDictionaryValueCallBacks));
   AddIntegerValue(properties, kIOSurfaceWidth, size.width());
   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_);
 
     IOSurfaceMapKey key(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;
-  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);
-  IOSurfaceMap::iterator it = io_surfaces_.find(key);
-  if (it != io_surfaces_.end())
-    io_surfaces_.erase(it);
+    IOSurfaceMapKey key(id, client_id);
+    IOSurfaceMap::iterator it = io_surfaces_.find(key);

[Daniele Castagna, 2015/05/08 18:58:30]

io_surfaces_.erase(IOSurfaceMapKey(id, client_id));

[reveman, 2015/05/09 15:54:54]

https://codereview.chromium.org/1131463004

+    if (it != io_surfaces_.end())
+      io_surfaces_.erase(it);
+  }
+
+  IOSurfaceManager::GetInstance()->UnregisterIOSurface(id, client_id);
 }
 
 gpu::ImageFactory* GpuMemoryBufferFactoryIOSurface::AsImageFactory() {
   return this;
 }
 
 scoped_refptr<gfx::GLImage>
 GpuMemoryBufferFactoryIOSurface::CreateImageForGpuMemoryBuffer(
     const gfx::GpuMemoryBufferHandle& handle,
     const gfx::Size& size,
     gfx::GpuMemoryBuffer::Format 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);
   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));
   if (!image->Initialize(it->second.get()))
     return scoped_refptr<gfx::GLImage>();
 
   return image;
 }
 
 }  // namespace content