Send compositor frame IPC with metadata.

content/common/cc_messages.h

Index: content/common/cc_messages.h
diff --git a/content/common/cc_messages.h b/content/common/cc_messages.h
index 5730309f7f1192550a4c0ab091b9c9eefea338c3..dd5fa763d7e79f73a4b0067da9bb548ea7b713ac 100644
--- a/content/common/cc_messages.h
+++ b/content/common/cc_messages.h
@@ -5,9 +5,12 @@
 // 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/delegated_compositor_frame.h"
 #include "cc/draw_quad.h"
+#include "cc/gl_compositor_frame.h"
 #include "cc/io_surface_draw_quad.h"
 #include "cc/render_pass.h"
 #include "cc/render_pass_draw_quad.h"
@@ -82,8 +85,8 @@ struct CONTENT_EXPORT ParamTraits<cc::Mailbox> {
 };
 
 template<>
-struct CONTENT_EXPORT ParamTraits<cc::CompositorFrame> {
-  typedef cc::CompositorFrame param_type;
+struct CONTENT_EXPORT ParamTraits<cc::DelegatedCompositorFrame> {
+  typedef cc::DelegatedCompositorFrame 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);
@@ -99,6 +102,7 @@ struct CONTENT_EXPORT ParamTraits<cc::CompositorFrame> {
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
+IPC_ENUM_TRAITS(cc::CompositorFrame::FrameType)
 IPC_ENUM_TRAITS(cc::DrawQuad::Material)
 IPC_ENUM_TRAITS(cc::IOSurfaceDrawQuad::Orientation)
 IPC_ENUM_TRAITS(WebKit::WebFilterOperation::FilterType)
@@ -211,3 +215,24 @@ 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::CompositorFrame)
+  IPC_STRUCT_TRAITS_MEMBER(type)

[piman, 2012/12/14 22:02:22]

Somewhere, we need to check the enum values, verify it's only DELEGATED or GL,
and refuse the message if it's not. Where should we do that?

+  IPC_STRUCT_TRAITS_MEMBER(metadata)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(cc::GLCompositorFrame)
+  IPC_STRUCT_TRAITS_PARENT(cc::CompositorFrame)

[piman, 2012/12/14 22:02:22]

We should check somewhere that type == GL.

+  IPC_STRUCT_TRAITS_MEMBER(mailbox_name)
+  IPC_STRUCT_TRAITS_MEMBER(sync_point)
+IPC_STRUCT_TRAITS_END()