Replace IOSurfaceManager by directly passing IOSurface Mach ports over Chrome IPC.

content/common/gpu/gpu_memory_buffer_factory_io_surface.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_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_
 #define CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_
 
 #include <utility>
 
 #include <IOSurface/IOSurface.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/mac/scoped_cftyperef.h"
 #include "base/memory/ref_counted.h"
 #include "base/synchronization/lock.h"
 #include "content/common/content_export.h"
 #include "content/common/gpu/gpu_memory_buffer_factory.h"
 #include "gpu/command_buffer/service/image_factory.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/gpu_memory_buffer.h"
-#include "ui/gfx/mac/io_surface_manager.h"
+#include "ui/gfx/mac/io_surface.h"
 
 namespace gl {
 class GLImage;
 }
 
 namespace content {
 
 class CONTENT_EXPORT GpuMemoryBufferFactoryIOSurface
     : public GpuMemoryBufferFactory,
       public gpu::ImageFactory {
@@ skipping 27 matching lines @@
       const gfx::GpuMemoryBufferHandle& handle,
       const gfx::Size& size,
       gfx::BufferFormat format,
       unsigned internalformat,
       int client_id) override;
 
  private:
   typedef std::pair<gfx::IOSurfaceId, int> IOSurfaceMapKey;
   typedef base::hash_map<IOSurfaceMapKey, base::ScopedCFTypeRef<IOSurfaceRef>>
       IOSurfaceMap;
   IOSurfaceMap io_surfaces_;

[reveman, 2015/12/21 20:11:16]

FYI, this map could now be removed in favor of passing a mach_port with
CreateImageCHROMIUM as that will fix the problem where an IOSurface can become
invalid if the GPU process crashes. We can do that as a follow up but can you
add the following TODO here for now?

TOOD(reveman): Remove |io_surfaces_| and allow IOSurface backed GMBs to be used
with any GPU process by passing a mach_port to CreateImageCHROMIUM.

[Robert Sesek, 2015/12/23 15:45:13]

Done.

   base::Lock io_surfaces_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuMemoryBufferFactoryIOSurface);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_GPU_GPU_MEMORY_BUFFER_FACTORY_IO_SURFACE_H_