| 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 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType, | 60 IPC_ENUM_TRAITS_MAX_VALUE(gfx::GpuMemoryBufferType, |
| 61 gfx::GPU_MEMORY_BUFFER_TYPE_LAST) | 61 gfx::GPU_MEMORY_BUFFER_TYPE_LAST) |
| 62 | 62 |
| 63 #if defined(OS_ANDROID) | 63 #if defined(OS_ANDROID) |
| 64 IPC_STRUCT_TRAITS_BEGIN(gfx::SurfaceTextureId) | 64 IPC_STRUCT_TRAITS_BEGIN(gfx::SurfaceTextureId) |
| 65 IPC_STRUCT_TRAITS_MEMBER(primary_id) | 65 IPC_STRUCT_TRAITS_MEMBER(primary_id) |
| 66 IPC_STRUCT_TRAITS_MEMBER(secondary_id) | 66 IPC_STRUCT_TRAITS_MEMBER(secondary_id) |
| 67 IPC_STRUCT_TRAITS_END() | 67 IPC_STRUCT_TRAITS_END() |
| 68 #endif | 68 #endif |
| 69 | 69 |
| 70 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferId) |
| 71 IPC_STRUCT_TRAITS_MEMBER(primary_id) |
| 72 IPC_STRUCT_TRAITS_MEMBER(secondary_id) |
| 73 IPC_STRUCT_TRAITS_END() |
| 74 |
| 70 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) | 75 IPC_STRUCT_TRAITS_BEGIN(gfx::GpuMemoryBufferHandle) |
| 71 IPC_STRUCT_TRAITS_MEMBER(type) | 76 IPC_STRUCT_TRAITS_MEMBER(type) |
| 72 IPC_STRUCT_TRAITS_MEMBER(handle) | 77 IPC_STRUCT_TRAITS_MEMBER(handle) |
| 78 IPC_STRUCT_TRAITS_MEMBER(global_id) |
| 73 #if defined(OS_MACOSX) | 79 #if defined(OS_MACOSX) |
| 74 IPC_STRUCT_TRAITS_MEMBER(io_surface_id) | 80 IPC_STRUCT_TRAITS_MEMBER(io_surface_id) |
| 75 #endif | 81 #endif |
| 76 #if defined(OS_ANDROID) | 82 #if defined(OS_ANDROID) |
| 77 IPC_STRUCT_TRAITS_MEMBER(surface_texture_id) | 83 IPC_STRUCT_TRAITS_MEMBER(surface_texture_id) |
| 78 #endif | 84 #endif |
| 79 IPC_STRUCT_TRAITS_END() | 85 IPC_STRUCT_TRAITS_END() |
| 80 | 86 |
| 81 #undef IPC_MESSAGE_EXPORT | 87 #undef IPC_MESSAGE_EXPORT |
| 82 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 88 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| (...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 184 std::string /* output */) | 190 std::string /* output */) |
| 185 #endif | 191 #endif |
| 186 | 192 |
| 187 // Asks the browser to create a gpu memory buffer. | 193 // Asks the browser to create a gpu memory buffer. |
| 188 IPC_SYNC_MESSAGE_CONTROL4_1(ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer, | 194 IPC_SYNC_MESSAGE_CONTROL4_1(ChildProcessHostMsg_SyncAllocateGpuMemoryBuffer, |
| 189 uint32 /* width */, | 195 uint32 /* width */, |
| 190 uint32 /* height */, | 196 uint32 /* height */, |
| 191 uint32 /* internalformat */, | 197 uint32 /* internalformat */, |
| 192 uint32 /* usage */, | 198 uint32 /* usage */, |
| 193 gfx::GpuMemoryBufferHandle) | 199 gfx::GpuMemoryBufferHandle) |
| OLD | NEW |