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

content/common/child_process_messages.h

 // Copyright (c) 2012 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.
 
 // Common IPC messages used for child processes.
 // Multiply-included message file, hence no include guard.
 
 #include <string>
 #include <vector>
 
 #include "base/memory/shared_memory.h"
 #include "base/tracked_objects.h"
 #include "base/values.h"
 #include "cc/resources/shared_bitmap_manager.h"
 #include "content/common/content_export.h"
 #include "content/common/host_discardable_shared_memory_manager.h"
 #include "gpu/command_buffer/common/sync_token.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "ui/gfx/gpu_memory_buffer.h"
 #include "ui/gfx/ipc/gfx_param_traits.h"
 
-#if defined(OS_MACOSX)
-#include "content/common/mac/io_surface_manager_token.h"
-#endif
-
 IPC_ENUM_TRAITS_MAX_VALUE(tracked_objects::ThreadData::Status,
                           tracked_objects::ThreadData::STATUS_LAST)
 
 IPC_STRUCT_TRAITS_BEGIN(tracked_objects::LocationSnapshot)
   IPC_STRUCT_TRAITS_MEMBER(file_name)
   IPC_STRUCT_TRAITS_MEMBER(function_name)
   IPC_STRUCT_TRAITS_MEMBER(line_number)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(tracked_objects::BirthOnThreadSnapshot)
@@ skipping 30 matching lines @@
                           gfx::GPU_MEMORY_BUFFER_TYPE_LAST)
 
 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle)
   IPC_STRUCT_TRAITS_MEMBER(id)
   IPC_STRUCT_TRAITS_MEMBER(type)
   IPC_STRUCT_TRAITS_MEMBER(handle)
   IPC_STRUCT_TRAITS_MEMBER(offset)
   IPC_STRUCT_TRAITS_MEMBER(stride)
 #if defined(USE_OZONE)
   IPC_STRUCT_TRAITS_MEMBER(native_pixmap_handle)
+#elif defined(OS_MACOSX)
+  IPC_STRUCT_TRAITS_MEMBER(mach_port)
 #endif
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId)
   IPC_STRUCT_TRAITS_MEMBER(id)
 IPC_STRUCT_TRAITS_END()
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
@@ skipping 27 matching lines @@
                      int /* profiling_phase */)
 
 // Send to all the child processes to send back histogram data.
 IPC_MESSAGE_CONTROL1(ChildProcessMsg_GetChildHistogramData,
                      int /* sequence_number */)
 
 // Sent to child processes to tell them to enter or leave background mode.
 IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetProcessBackgrounded,
                      bool /* background */)
 
-#if defined(OS_MACOSX)
-// Sent to child processes to tell them what token to use when registering
-// and/or acquiring IOSurfaces.
-IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetIOSurfaceManagerToken,
-                     content::IOSurfaceManagerToken /* token */)
-#endif
-
 // Sends a pipe used by the child process to broker passing of Mojo handles.
 IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetMojoParentPipeHandle,
                      IPC::PlatformFileForTransit /* handle */)
 
 #if defined(USE_OZONE)
 // Sent to child processes to initialize ClientNativePixmapFactory using
 // a device file descriptor.
 IPC_MESSAGE_CONTROL1(ChildProcessMsg_InitializeClientNativePixmapFactory,
                      base::FileDescriptor /* device_fd */)
 #endif
@@ skipping 72 matching lines @@
 IPC_SYNC_MESSAGE_CONTROL2_1(
     ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory,
     uint32 /* size */,
     content::DiscardableSharedMemoryId,
     base::SharedMemoryHandle)
 
 // Informs the browser that the child deleted a block of discardable shared
 // memory.
 IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_DeletedDiscardableSharedMemory,
                      content::DiscardableSharedMemoryId)