OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 // Allows for sharing of IPC param structures between BrowserPlugin code and | 5 // Allows for sharing of IPC param structures between BrowserPlugin code and |
6 // RenderFrame code. All these should be folded directly back into the IPCs in | 6 // RenderFrame code. All these should be folded directly back into the IPCs in |
7 // frame_messages.h once BrowserPlugin has been fully converted over to use | 7 // frame_messages.h once BrowserPlugin has been fully converted over to use |
8 // the RenderFrame infrastructure. | 8 // the RenderFrame infrastructure. |
9 // | 9 // |
10 // TODO(ajwong): Remove once BrowserPlugin has been converted to use | 10 // TODO(ajwong): Remove once BrowserPlugin has been converted to use |
11 // RenderFrames. http://crbug.com/330264 | 11 // RenderFrames. http://crbug.com/330264 |
12 | 12 |
13 #ifndef CONTENT_COMMON_FRAME_PARAM_MACROS_H_ | 13 #ifndef CONTENT_COMMON_FRAME_PARAM_MACROS_H_ |
14 #define CONTENT_COMMON_FRAME_PARAM_MACROS_H_ | 14 #define CONTENT_COMMON_FRAME_PARAM_MACROS_H_ |
15 | 15 |
| 16 #include "cc/output/compositor_frame.h" |
16 #include "cc/output/compositor_frame_ack.h" | 17 #include "cc/output/compositor_frame_ack.h" |
17 #include "cc/output/compositor_frame.h" | |
18 #include "content/public/common/common_param_traits.h" | 18 #include "content/public/common/common_param_traits.h" |
19 #include "ipc/ipc_message_macros.h" | 19 #include "ipc/ipc_message_macros.h" |
| 20 #include "ui/gfx/ipc/gfx_param_traits.h" |
20 | 21 |
21 #undef IPC_MESSAGE_EXPORT | 22 #undef IPC_MESSAGE_EXPORT |
22 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT | 23 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
23 | 24 |
24 IPC_STRUCT_BEGIN(FrameMsg_BuffersSwapped_Params) | 25 IPC_STRUCT_BEGIN(FrameMsg_BuffersSwapped_Params) |
25 IPC_STRUCT_MEMBER(int, gpu_host_id) | 26 IPC_STRUCT_MEMBER(int, gpu_host_id) |
26 IPC_STRUCT_MEMBER(int, gpu_route_id) | 27 IPC_STRUCT_MEMBER(int, gpu_route_id) |
27 IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox) | 28 IPC_STRUCT_MEMBER(gpu::Mailbox, mailbox) |
28 IPC_STRUCT_MEMBER(gfx::Size, size) | 29 IPC_STRUCT_MEMBER(gfx::Size, size) |
29 IPC_STRUCT_END() | 30 IPC_STRUCT_END() |
(...skipping 25 matching lines...) Expand all Loading... |
55 IPC_STRUCT_END() | 56 IPC_STRUCT_END() |
56 | 57 |
57 IPC_STRUCT_BEGIN(FrameHostMsg_ReclaimCompositorResources_Params) | 58 IPC_STRUCT_BEGIN(FrameHostMsg_ReclaimCompositorResources_Params) |
58 IPC_STRUCT_MEMBER(int, route_id) | 59 IPC_STRUCT_MEMBER(int, route_id) |
59 IPC_STRUCT_MEMBER(uint32, output_surface_id) | 60 IPC_STRUCT_MEMBER(uint32, output_surface_id) |
60 IPC_STRUCT_MEMBER(int, renderer_host_id) | 61 IPC_STRUCT_MEMBER(int, renderer_host_id) |
61 IPC_STRUCT_MEMBER(cc::CompositorFrameAck, ack) | 62 IPC_STRUCT_MEMBER(cc::CompositorFrameAck, ack) |
62 IPC_STRUCT_END() | 63 IPC_STRUCT_END() |
63 | 64 |
64 #endif // CONTENT_COMMON_FRAME_PARAM_MACROS_H_ | 65 #endif // CONTENT_COMMON_FRAME_PARAM_MACROS_H_ |
OLD | NEW |