| Index: content/common/input_messages.h
|
| diff --git a/content/common/input_messages.h b/content/common/input_messages.h
|
| index 30ecc0941b2cb8641eb4053852f718981326dc9b..787404f27540497e05615370fa0cbdafe47be2c2 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"
|
| @@ -81,12 +82,22 @@ IPC_ENUM_TRAITS_MAX_VALUE(
|
| blink::WebGestureEvent::InertialPhaseState::kLastPhase)
|
| IPC_ENUM_TRAITS_MAX_VALUE(blink::WebTouchPoint::State,
|
| blink::WebTouchPoint::State::kStateMax)
|
| +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)
|
|
|