Chromium Code Reviews| Index: content/common/frame_messages.h |
| diff --git a/content/common/frame_messages.h b/content/common/frame_messages.h |
| index 87f769b5fd0455b106a38bd6d9a7a4c54869ce94..62ac33d9ae8493b9dfffa6832f887620d63bb2ae 100644 |
| --- a/content/common/frame_messages.h |
| +++ b/content/common/frame_messages.h |
| @@ -5,15 +5,40 @@ |
| // IPC messages for interacting with frames. |
| // Multiply-included message file, hence no include guard. |
| +#include "cc/output/begin_frame_args.h" |
| +#include "cc/output/compositor_frame.h" |
| +#include "cc/output/compositor_frame_ack.h" |
| #include "content/common/content_export.h" |
| #include "content/public/common/common_param_traits.h" |
| #include "ipc/ipc_message_macros.h" |
| +#include "url/gurl.h" |
| #undef IPC_MESSAGE_EXPORT |
| #define IPC_MESSAGE_EXPORT CONTENT_EXPORT |
| #define IPC_MESSAGE_START FrameMsgStart |
| +// ----------------------------------------------------------------------------- |
| +// Messages sent from the browser to the renderer. |
| + |
| +// When HW accelerated buffers are swapped in an out of process child frame |
| +// renderer, the message is forwarded to the top level frame renderer to |
| +// notify it of a new texture available for compositing. |
| +IPC_MESSAGE_ROUTED4(FrameMsg_ChildFrameBuffersSwapped, |
| + gfx::Size /* size */, |
| + std::string /* mailbox_name */, |
| + int /* route_id */, |
|
piman
2013/12/17 00:14:57
route_id of what? How does that relate to the impl
awong
2013/12/17 02:45:27
Ooh...good catch. It's the gpu_route_id. Comes fr
|
| + int /* gpu_host_id */) |
|
piman
2013/12/17 00:14:57
2 things about these messages:
1- I don't see the
awong
2013/12/17 02:45:27
This is part 1 of a set of CLs that are being upst
|
| + |
| +IPC_MESSAGE_ROUTED4(FrameMsg_ChildFrameCompositorFrameSwapped, |
| + cc::CompositorFrame /* frame */, |
| + int /* route_id */, |
| + uint32 /* output_surface_id */, |
| + int /* renderer_host_id */) |
| + |
| +// ----------------------------------------------------------------------------- |
| +// Messages sent from the renderer to the browser. |
| + |
| // Sent by the renderer when a child frame is created in the renderer. The |
| // |parent_frame_id| and |frame_id| are NOT routing ids. They are |
| // renderer-allocated identifiers used for tracking a frame's creation. |
| @@ -85,3 +110,13 @@ IPC_SYNC_MESSAGE_CONTROL4_2(FrameHostMsg_OpenChannelToPlugin, |
| std::string /* mime_type */, |
| IPC::ChannelHandle /* channel_handle */, |
| content::WebPluginInfo /* info */) |
| + |
|
nasko
2013/12/16 23:16:32
nit: just one empty line
awong
2013/12/17 02:45:27
Done.
|
| + |
| +// Acknowledge that we presented a HW buffer and provide a sync point |
| +// to specify the location in the command stream when the compositor |
| +// is no longer using it. |
| +IPC_MESSAGE_ROUTED4(FrameHostMsg_BuffersSwappedACK, |
| + std::string /* mailbox_name */, |
| + int /* route_id */, |
| + int /* gpu_host_id */, |
| + uint32 /* sync_point */) |