Index: content/common/input_messages.h |
diff --git a/content/common/input_messages.h b/content/common/input_messages.h |
index 999987f8f5856cea5f82edbda9eec9df1be54216..7f094bacecf9c78481594e2450fe4815533e9a60 100644 |
--- a/content/common/input_messages.h |
+++ b/content/common/input_messages.h |
@@ -8,6 +8,7 @@ |
#include "base/strings/string16.h" |
#include "build/build_config.h" |
+#include "cc/input/scroll_boundary_behavior.h" |
#include "cc/input/touch_action.h" |
#include "content/common/content_export.h" |
#include "content/common/content_param_traits.h" |
@@ -64,12 +65,22 @@ IPC_ENUM_TRAITS_MAX_VALUE( |
IPC_ENUM_TRAITS_MAX_VALUE(content::InputEventDispatchType, |
content::InputEventDispatchType::DISPATCH_TYPE_MAX) |
IPC_ENUM_TRAITS_MAX_VALUE(cc::TouchAction, cc::kTouchActionMax) |
+IPC_ENUM_TRAITS_MAX_VALUE( |
+ cc::ScrollBoundaryBehavior::ScrollBoundaryBehaviorType, |
+ cc::ScrollBoundaryBehavior::ScrollBoundaryBehaviorType:: |
+ kScrollBoundaryBehaviorTypeNone) |
IPC_STRUCT_TRAITS_BEGIN(ui::DidOverscrollParams) |
IPC_STRUCT_TRAITS_MEMBER(accumulated_overscroll) |
IPC_STRUCT_TRAITS_MEMBER(latest_overscroll_delta) |
IPC_STRUCT_TRAITS_MEMBER(current_fling_velocity) |
IPC_STRUCT_TRAITS_MEMBER(causal_event_viewport_point) |
+ IPC_STRUCT_TRAITS_MEMBER(scroll_boundary_behavior) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(cc::ScrollBoundaryBehavior) |
+ IPC_STRUCT_TRAITS_MEMBER(x) |
+ IPC_STRUCT_TRAITS_MEMBER(y) |
IPC_STRUCT_TRAITS_END() |
IPC_STRUCT_TRAITS_BEGIN(content::EditCommand) |