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 // Multiply-included message file, hence no include guard here, but see below | 5 // Multiply-included message file, hence no include guard here, but see below |
6 // for a much smaller-than-usual include guard section. | 6 // for a much smaller-than-usual include guard section. |
7 | 7 |
8 #include <vector> | 8 #include <vector> |
9 #include <string> | 9 #include <string> |
10 | 10 |
11 #include "base/shared_memory.h" | 11 #include "base/shared_memory.h" |
12 #include "content/common/content_export.h" | |
12 #include "content/common/gpu/gpu_memory_allocation.h" | 13 #include "content/common/gpu/gpu_memory_allocation.h" |
13 #include "content/common/gpu/gpu_process_launch_causes.h" | 14 #include "content/common/gpu/gpu_process_launch_causes.h" |
14 #include "content/public/common/common_param_traits.h" | 15 #include "content/public/common/common_param_traits.h" |
15 #include "content/public/common/gpu_info.h" | 16 #include "content/public/common/gpu_info.h" |
16 #include "gpu/command_buffer/common/command_buffer.h" | 17 #include "gpu/command_buffer/common/command_buffer.h" |
17 #include "gpu/command_buffer/common/constants.h" | 18 #include "gpu/command_buffer/common/constants.h" |
18 #include "gpu/ipc/gpu_command_buffer_traits.h" | 19 #include "gpu/ipc/gpu_command_buffer_traits.h" |
19 #include "ipc/ipc_channel_handle.h" | 20 #include "ipc/ipc_channel_handle.h" |
20 #include "ipc/ipc_message_macros.h" | 21 #include "ipc/ipc_message_macros.h" |
21 #include "media/video/video_decode_accelerator.h" | 22 #include "media/video/video_decode_accelerator.h" |
(...skipping 17 matching lines...) Expand all Loading... | |
39 IPC_STRUCT_MEMBER(int32, width) | 40 IPC_STRUCT_MEMBER(int32, width) |
40 IPC_STRUCT_MEMBER(int32, height) | 41 IPC_STRUCT_MEMBER(int32, height) |
41 IPC_STRUCT_MEMBER(uint64, surface_handle) | 42 IPC_STRUCT_MEMBER(uint64, surface_handle) |
42 IPC_STRUCT_MEMBER(int32, route_id) | 43 IPC_STRUCT_MEMBER(int32, route_id) |
43 #if defined(OS_MACOSX) | 44 #if defined(OS_MACOSX) |
44 IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window) | 45 IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window) |
45 IPC_STRUCT_MEMBER(bool, create_transport_dib) | 46 IPC_STRUCT_MEMBER(bool, create_transport_dib) |
46 #endif | 47 #endif |
47 IPC_STRUCT_END() | 48 IPC_STRUCT_END() |
48 | 49 |
50 //struct CONTENT_EXPORT GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params; | |
51 #undef IPC_MESSAGE_EXPORT | |
52 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | |
Nico
2012/03/16 05:48:26
This is the only params struct used by tests in th
| |
49 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params) | 53 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfaceBuffersSwapped_Params) |
50 IPC_STRUCT_MEMBER(int32, surface_id) | 54 IPC_STRUCT_MEMBER(int32, surface_id) |
51 IPC_STRUCT_MEMBER(uint64, surface_handle) | 55 IPC_STRUCT_MEMBER(uint64, surface_handle) |
52 IPC_STRUCT_MEMBER(int32, route_id) | 56 IPC_STRUCT_MEMBER(int32, route_id) |
53 #if defined(OS_WIN) | 57 #if defined(OS_WIN) |
54 IPC_STRUCT_MEMBER(gfx::Size, size) | 58 IPC_STRUCT_MEMBER(gfx::Size, size) |
55 #elif defined(OS_MACOSX) | 59 #elif defined(OS_MACOSX) |
56 IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window) | 60 IPC_STRUCT_MEMBER(gfx::PluginWindowHandle, window) |
57 #endif | 61 #endif |
58 IPC_STRUCT_END() | 62 IPC_STRUCT_END() |
63 #undef IPC_MESSAGE_EXPORT | |
64 #define IPC_MESSAGE_EXPORT | |
59 | 65 |
60 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params) | 66 IPC_STRUCT_BEGIN(GpuHostMsg_AcceleratedSurfacePostSubBuffer_Params) |
61 IPC_STRUCT_MEMBER(int32, surface_id) | 67 IPC_STRUCT_MEMBER(int32, surface_id) |
62 IPC_STRUCT_MEMBER(uint64, surface_handle) | 68 IPC_STRUCT_MEMBER(uint64, surface_handle) |
63 IPC_STRUCT_MEMBER(int32, route_id) | 69 IPC_STRUCT_MEMBER(int32, route_id) |
64 IPC_STRUCT_MEMBER(int, x) | 70 IPC_STRUCT_MEMBER(int, x) |
65 IPC_STRUCT_MEMBER(int, y) | 71 IPC_STRUCT_MEMBER(int, y) |
66 IPC_STRUCT_MEMBER(int, width) | 72 IPC_STRUCT_MEMBER(int, width) |
67 IPC_STRUCT_MEMBER(int, height) | 73 IPC_STRUCT_MEMBER(int, height) |
68 #if defined(OS_MACOSX) | 74 #if defined(OS_MACOSX) |
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
503 | 509 |
504 // Confirm decoder has been flushed. | 510 // Confirm decoder has been flushed. |
505 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone) | 511 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_FlushDone) |
506 | 512 |
507 // Confirm decoder has been reset. | 513 // Confirm decoder has been reset. |
508 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone) | 514 IPC_MESSAGE_ROUTED0(AcceleratedVideoDecoderHostMsg_ResetDone) |
509 | 515 |
510 // Video decoder has encountered an error. | 516 // Video decoder has encountered an error. |
511 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification, | 517 IPC_MESSAGE_ROUTED1(AcceleratedVideoDecoderHostMsg_ErrorNotification, |
512 uint32) /* Error ID */ | 518 uint32) /* Error ID */ |
OLD | NEW |