Send compositor frame IPC with metadata.

content/common/cc_messages.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
 // 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"
 #include "cc/shared_quad_state.h"
 #include "cc/solid_color_draw_quad.h"
 #include "cc/stream_video_draw_quad.h"
 #include "cc/texture_draw_quad.h"
 #include "cc/tile_draw_quad.h"
 #include "cc/transferable_resource.h"
 #include "cc/video_layer_impl.h"
@@ skipping 54 matching lines @@
 
 template<>
 struct CONTENT_EXPORT ParamTraits<cc::Mailbox> {
   typedef cc::Mailbox 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);
 };
 
 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);
 };
 
 }  // namespace IPC
 
 #endif  // CONTENT_COMMON_CC_MESSAGES_H_
 
 // Multiply-included message file, hence no include guard.
 
 #define IPC_MESSAGE_START CCMsgStart
 #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)
 
 IPC_STRUCT_TRAITS_BEGIN(cc::RenderPass::Id)
   IPC_STRUCT_TRAITS_MEMBER(layer_id)
   IPC_STRUCT_TRAITS_MEMBER(index)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(cc::VideoLayerImpl::FramePlane)
@@ skipping 92 matching lines @@
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(cc::TransferableResourceList)
   IPC_STRUCT_TRAITS_MEMBER(sync_point)
   IPC_STRUCT_TRAITS_MEMBER(resources)
 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()