| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 // Common IPC messages used for child processes. | 5 // Common IPC messages used for child processes. |
| 6 // Multiply-included message file, hence no include guard. | 6 // Multiply-included message file, hence no include guard. |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 58 | 58 |
| 59 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType, | 59 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType, |
| 60 gfx::GPU_MEMORY_BUFFER_TYPE_LAST) | 60 gfx::GPU_MEMORY_BUFFER_TYPE_LAST) |
| 61 | 61 |
| 62 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) | 62 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) |
| 63 IPC_STRUCT_TRAITS_MEMBER(id) | 63 IPC_STRUCT_TRAITS_MEMBER(id) |
| 64 IPC_STRUCT_TRAITS_MEMBER(type) | 64 IPC_STRUCT_TRAITS_MEMBER(type) |
| 65 IPC_STRUCT_TRAITS_MEMBER(handle) | 65 IPC_STRUCT_TRAITS_MEMBER(handle) |
| 66 #if defined(OS_MACOSX) | 66 #if defined(OS_MACOSX) |
| 67 IPC_STRUCT_TRAITS_MEMBER(io_surface_id) | 67 IPC_STRUCT_TRAITS_MEMBER(io_surface_id) |
| 68 #elif defined(USE_OZONE) |
| 69 IPC_STRUCT_TRAITS_MEMBER(device_handle) |
| 68 #endif | 70 #endif |
| 69 IPC_STRUCT_TRAITS_END() | 71 IPC_STRUCT_TRAITS_END() |
| 70 | 72 |
| 71 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBuffer::Format, | 73 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBuffer::Format, |
| 72 gfx::GpuMemoryBuffer::FORMAT_LAST) | 74 gfx::GpuMemoryBuffer::FORMAT_LAST) |
| 73 | 75 |
| 74 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBuffer::Usage, | 76 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBuffer::Usage, |
| 75 gfx::GpuMemoryBuffer::USAGE_LAST) | 77 gfx::GpuMemoryBuffer::USAGE_LAST) |
| 76 | 78 |
| 77 #undef IPC_MESSAGE_EXPORT | 79 #undef IPC_MESSAGE_EXPORT |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 IPC_SYNC_MESSAGE_CONTROL2_1( | 201 IPC_SYNC_MESSAGE_CONTROL2_1( |
| 200 ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory, | 202 ChildProcessHostMsg_SyncAllocateLockedDiscardableSharedMemory, |
| 201 uint32 /* size */, | 203 uint32 /* size */, |
| 202 content::DiscardableSharedMemoryId, | 204 content::DiscardableSharedMemoryId, |
| 203 base::SharedMemoryHandle) | 205 base::SharedMemoryHandle) |
| 204 | 206 |
| 205 // Informs the browser that the child deleted a block of discardable shared | 207 // Informs the browser that the child deleted a block of discardable shared |
| 206 // memory. | 208 // memory. |
| 207 IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_DeletedDiscardableSharedMemory, | 209 IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_DeletedDiscardableSharedMemory, |
| 208 content::DiscardableSharedMemoryId) | 210 content::DiscardableSharedMemoryId) |
| OLD | NEW |