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..a1187c7887dec2bac759975dd6a5ed5316a60f84 100644 |
--- a/content/common/content_param_traits_macros.h |
+++ b/content/common/content_param_traits_macros.h |
@@ -8,9 +8,11 @@ |
#ifndef CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_ |
#define CONTENT_COMMON_CONTENT_PARAM_TRAITS_MACROS_H_ |
+#include "cc/ipc/cc_param_traits.h" |
#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 +24,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 +60,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(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_ |