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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
55 IPC_STRUCT_TRAITS_MEMBER(descendants) | 55 IPC_STRUCT_TRAITS_MEMBER(descendants) |
56 IPC_STRUCT_TRAITS_MEMBER(process_id) | 56 IPC_STRUCT_TRAITS_MEMBER(process_id) |
57 IPC_STRUCT_TRAITS_END() | 57 IPC_STRUCT_TRAITS_END() |
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(type) | 63 IPC_STRUCT_TRAITS_MEMBER(type) |
64 IPC_STRUCT_TRAITS_MEMBER(handle) | 64 IPC_STRUCT_TRAITS_MEMBER(handle) |
| 65 #if defined(OS_ANDROID) |
| 66 IPC_STRUCT_TRAITS_MEMBER(native_buffer) |
| 67 IPC_STRUCT_TRAITS_MEMBER(texture_id) |
| 68 IPC_STRUCT_TRAITS_MEMBER(surface_texture_handle) |
| 69 #endif |
65 #if defined(OS_MACOSX) | 70 #if defined(OS_MACOSX) |
66 IPC_STRUCT_TRAITS_MEMBER(io_surface_id) | 71 IPC_STRUCT_TRAITS_MEMBER(io_surface_id) |
67 #endif | 72 #endif |
68 IPC_STRUCT_TRAITS_END() | 73 IPC_STRUCT_TRAITS_END() |
69 | 74 |
70 #undef IPC_MESSAGE_EXPORT | 75 #undef IPC_MESSAGE_EXPORT |
71 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 76 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
72 | 77 |
73 #define IPC_MESSAGE_START ChildProcessMsgStart | 78 #define IPC_MESSAGE_START ChildProcessMsgStart |
74 | 79 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
151 IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_TcmallocStats, | 156 IPC_MESSAGE_CONTROL1(ChildProcessHostMsg_TcmallocStats, |
152 std::string /* output */) | 157 std::string /* output */) |
153 #endif | 158 #endif |
154 | 159 |
155 // Asks the browser to create a gpu memory buffer. | 160 // Asks the browser to create a gpu memory buffer. |
156 IPC_SYNC_MESSAGE_CONTROL3_1(ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer, | 161 IPC_SYNC_MESSAGE_CONTROL3_1(ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer, |
157 uint32 /* width */, | 162 uint32 /* width */, |
158 uint32 /* height */, | 163 uint32 /* height */, |
159 uint32 /* internalformat */, | 164 uint32 /* internalformat */, |
160 gfx::GpuMemoryBufferHandle) | 165 gfx::GpuMemoryBufferHandle) |
OLD | NEW |