Aura: Browser-side changes for Composite-To-Mailbox

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 c489b9760a2f6fdc9d8cce28c4ec7f8cc238a48c..44ed4c0c0797d568faa7c0e1c62807daf3f82c08 100644
--- a/content/common/cc_messages.h
+++ b/content/common/cc_messages.h
@@ -91,6 +91,14 @@ struct CONTENT_EXPORT ParamTraits<cc::CompositorFrame> {
 };
 
 template<>
+struct CONTENT_EXPORT ParamTraits<cc::CompositorFrameAck> {
+  typedef cc::CompositorFrameAck 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::DelegatedFrameData> {
   typedef cc::DelegatedFrameData param_type;
   static void Write(Message* m, const param_type& p);
@@ -225,10 +233,6 @@ IPC_STRUCT_TRAITS_BEGIN(cc::TransferableResourceList)
   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)
@@ -243,4 +247,5 @@ IPC_STRUCT_TRAITS_END()
 IPC_STRUCT_TRAITS_BEGIN(cc::GLFrameData)
   IPC_STRUCT_TRAITS_MEMBER(mailbox)
   IPC_STRUCT_TRAITS_MEMBER(sync_point)
+  IPC_STRUCT_TRAITS_MEMBER(size)
 IPC_STRUCT_TRAITS_END()