Index: content/common/child_process_messages.h |
diff --git a/content/common/child_process_messages.h b/content/common/child_process_messages.h |
index 3f37fbfd1e7a159335eb363c6e7a9a2fa6fa84a9..e54221aaf1fac0123d809f1884d11f9dd656edf0 100644 |
--- a/content/common/child_process_messages.h |
+++ b/content/common/child_process_messages.h |
@@ -17,6 +17,10 @@ |
#include "ipc/ipc_message_macros.h" |
#include "ui/gfx/gpu_memory_buffer.h" |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
Robert Sesek
2015/06/01 21:58:07
Same bit about IOS.
reveman
2015/06/02 22:48:07
Done.
|
+#include "content/common/mac/io_surface_manager_token.h" |
+#endif |
+ |
IPC_ENUM_TRAITS_MAX_VALUE(tracked_objects::ThreadData::Status, |
tracked_objects::ThreadData::STATUS_LAST) |
@@ -63,9 +67,6 @@ IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) |
IPC_STRUCT_TRAITS_MEMBER(id) |
IPC_STRUCT_TRAITS_MEMBER(type) |
IPC_STRUCT_TRAITS_MEMBER(handle) |
-#if defined(OS_MACOSX) |
- IPC_STRUCT_TRAITS_MEMBER(io_surface_id) |
-#endif |
IPC_STRUCT_TRAITS_END() |
IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBuffer::Format, |
@@ -119,6 +120,13 @@ IPC_MESSAGE_CONTROL1(ChildProcessMsg_SetProcessBackgrounded, |
IPC_MESSAGE_CONTROL0(ChildProcessMsg_GetTcmallocStats) |
#endif |
+#if defined(OS_MACOSX) && !defined(OS_IOS) |
+// 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 |
+ |
//////////////////////////////////////////////////////////////////////////////// |
// Messages sent from the child process to the browser. |