Factor FrameData out of RendererCompositorFrameSink

content/common/content_param_traits_macros.h

Index: content/common/content_param_traits_macros.h
diff --git a/content/common/content_param_traits_macros.h b/content/common/content_param_traits_macros.h
index 1f3597a732c763489b984a6b0eeae612c03bb665..d05ec88337a141b64dc0979a1c7ecd52f33de750 100644
--- a/content/common/content_param_traits_macros.h
+++ b/content/common/content_param_traits_macros.h
@@ -11,6 +11,7 @@
 #include "content/common/content_export.h"
 #include "content/common/download/mhtml_save_status.h"
 #include "content/common/input/input_event_ack_state.h"
+#include "content/common/render_widget_surface_properties.h"
 #include "content/public/common/request_context_frame_type.h"
 #include "content/public/common/request_context_type.h"
 #include "content/public/common/resource_type.h"
@@ -22,6 +23,7 @@
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 #include "third_party/WebKit/public/web/WebSharedWorkerCreationContextType.h"
 #include "ui/gfx/gpu_memory_buffer.h"
+#include "ui/gfx/ipc/geometry/gfx_param_traits.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
@@ -57,4 +59,17 @@ IPC_STRUCT_TRAITS_BEGIN(blink::WebCompositionUnderline)
   IPC_STRUCT_TRAITS_MEMBER(background_color)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(content::RenderWidgetSurfaceProperties)
+  IPC_STRUCT_TRAITS_MEMBER(frame_size)
+  IPC_STRUCT_TRAITS_MEMBER(device_scale_factor)
+#ifdef OS_ANDROID
+  IPC_STRUCT_TRAITS_MEMBER(top_controls_height);
+  IPC_STRUCT_TRAITS_MEMBER(top_controls_shown_ratio);
+  IPC_STRUCT_TRAITS_MEMBER(bottom_controls_height);
+  IPC_STRUCT_TRAITS_MEMBER(bottom_controls_shown_ratio);
+  IPC_STRUCT_TRAITS_MEMBER(selection);
+  IPC_STRUCT_TRAITS_MEMBER(has_transparent_background);
+#endif
+IPC_STRUCT_TRAITS_END()
+
 #endif  // CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_