Index: content/common/cc_messages.h |
diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h |
index 5730309f7f1192550a4c0ab091b9c9eefea338c3..dfe9ef61260f1be11ef1cf51d25fc747470be5fb 100644 |
--- a/content/common/cc_messages.h |
+++ b/content/common/cc_messages.h |
@@ -5,6 +5,7 @@ |
// IPC Messages sent between compositor instances. |
#include "cc/checkerboard_draw_quad.h" |
+#include "cc/compositor_frame.h" |
#include "cc/compositor_frame_ack.h" |
#include "cc/debug_border_draw_quad.h" |
#include "cc/draw_quad.h" |
@@ -89,6 +90,14 @@ struct CONTENT_EXPORT ParamTraits<cc::CompositorFrame> { |
static void Log(const param_type& p, std::string* l); |
}; |
+template<> |
+struct CONTENT_EXPORT ParamTraits<cc::DelegatedFrameData> { |
+ typedef cc::DelegatedFrameData param_type; |
+ static void Write(Message* m, const param_type& p); |
+ static bool Read(const Message* m, PickleIterator* iter, param_type* p); |
+ static void Log(const param_type& p, std::string* l); |
+}; |
+ |
} // namespace IPC |
#endif // CONTENT_COMMON_CC_MESSAGES_H_ |
@@ -211,3 +220,18 @@ IPC_STRUCT_TRAITS_END() |
IPC_STRUCT_TRAITS_BEGIN(cc::CompositorFrameAck) |
IPC_STRUCT_TRAITS_MEMBER(resources) |
IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(cc::CompositorFrameMetadata) |
+ IPC_STRUCT_TRAITS_MEMBER(root_scroll_offset) |
+ IPC_STRUCT_TRAITS_MEMBER(page_scale_factor) |
+ IPC_STRUCT_TRAITS_MEMBER(viewport_size) |
+ IPC_STRUCT_TRAITS_MEMBER(root_layer_size) |
+ IPC_STRUCT_TRAITS_MEMBER(min_page_scale_factor) |
+ IPC_STRUCT_TRAITS_MEMBER(max_page_scale_factor) |
+ IPC_STRUCT_TRAITS_MEMBER(location_bar_offset) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(cc::GLFrameData) |
+ IPC_STRUCT_TRAITS_MEMBER(mailbox) |
+ IPC_STRUCT_TRAITS_MEMBER(sync_point) |
+IPC_STRUCT_TRAITS_END() |