diff options
Diffstat (limited to 'chromium/content/common/input_messages.h')
| -rw-r--r-- | chromium/content/common/input_messages.h | 50 |
1 files changed, 34 insertions, 16 deletions
diff --git a/chromium/content/common/input_messages.h b/chromium/content/common/input_messages.h index 80b0536d054..6b36bec4d15 100644 --- a/chromium/content/common/input_messages.h +++ b/chromium/content/common/input_messages.h @@ -10,21 +10,23 @@ #include "content/common/content_export.h" #include "content/common/content_param_traits.h" #include "content/common/edit_command.h" +#include "content/common/input/did_overscroll_params.h" #include "content/common/input/input_event.h" +#include "content/common/input/input_event_ack_state.h" #include "content/common/input/input_param_traits.h" #include "content/common/input/synthetic_gesture_packet.h" #include "content/common/input/synthetic_gesture_params.h" #include "content/common/input/synthetic_pinch_gesture_params.h" #include "content/common/input/synthetic_smooth_scroll_gesture_params.h" #include "content/common/input/synthetic_tap_gesture_params.h" -#include "content/port/common/input_event_ack_state.h" #include "content/public/common/common_param_traits.h" #include "content/common/input/touch_action.h" #include "ipc/ipc_message_macros.h" #include "third_party/WebKit/public/web/WebInputEvent.h" -#include "ui/events/latency_info.h" +#include "ui/events/ipc/latency_info_param_traits.h" #include "ui/gfx/point.h" #include "ui/gfx/rect.h" +#include "ui/gfx/vector2d_f.h" #undef IPC_MESSAGE_EXPORT #define IPC_MESSAGE_EXPORT CONTENT_EXPORT @@ -43,8 +45,19 @@ IPC_ENUM_TRAITS_MAX_VALUE( IPC_ENUM_TRAITS_MAX_VALUE( content::SyntheticGestureParams::GestureType, content::SyntheticGestureParams::SYNTHETIC_GESTURE_TYPE_MAX) -IPC_ENUM_TRAITS_MAX_VALUE(content::TouchAction, - content::TOUCH_ACTION_MAX) +IPC_ENUM_TRAITS_VALIDATE(content::TouchAction, ( + value >= 0 && + value <= content::TOUCH_ACTION_MAX && + (!(value & content::TOUCH_ACTION_NONE) || + (value == content::TOUCH_ACTION_NONE)) && + (!(value & content::TOUCH_ACTION_PINCH_ZOOM) || + (value == content::TOUCH_ACTION_MANIPULATION)))) + +IPC_STRUCT_TRAITS_BEGIN(content::DidOverscrollParams) + IPC_STRUCT_TRAITS_MEMBER(accumulated_overscroll) + IPC_STRUCT_TRAITS_MEMBER(latest_overscroll_delta) + IPC_STRUCT_TRAITS_MEMBER(current_fling_velocity) +IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(content::EditCommand) IPC_STRUCT_TRAITS_MEMBER(name) @@ -63,16 +76,15 @@ IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(content::SyntheticSmoothScrollGestureParams) IPC_STRUCT_TRAITS_PARENT(content::SyntheticGestureParams) - IPC_STRUCT_TRAITS_MEMBER(distance) IPC_STRUCT_TRAITS_MEMBER(anchor) + IPC_STRUCT_TRAITS_MEMBER(distances) IPC_STRUCT_TRAITS_MEMBER(prevent_fling) IPC_STRUCT_TRAITS_MEMBER(speed_in_pixels_s) IPC_STRUCT_TRAITS_END() IPC_STRUCT_TRAITS_BEGIN(content::SyntheticPinchGestureParams) IPC_STRUCT_TRAITS_PARENT(content::SyntheticGestureParams) - IPC_STRUCT_TRAITS_MEMBER(zoom_in) - IPC_STRUCT_TRAITS_MEMBER(total_num_pixels_covered) + IPC_STRUCT_TRAITS_MEMBER(scale_factor) IPC_STRUCT_TRAITS_MEMBER(anchor) IPC_STRUCT_TRAITS_MEMBER(relative_pointer_speed_in_pixels_s) IPC_STRUCT_TRAITS_END() @@ -83,6 +95,14 @@ IPC_STRUCT_TRAITS_BEGIN(content::SyntheticTapGestureParams) IPC_STRUCT_TRAITS_MEMBER(duration_ms) IPC_STRUCT_TRAITS_END() +IPC_STRUCT_BEGIN(InputHostMsg_HandleInputEvent_ACK_Params) + IPC_STRUCT_MEMBER(blink::WebInputEvent::Type, type) + IPC_STRUCT_MEMBER(content::InputEventAckState, state) + IPC_STRUCT_MEMBER(ui::LatencyInfo, latency) + // TODO(jdduke): Use Optional<T> type to avoid heap alloc, crbug.com/375002. + IPC_STRUCT_MEMBER(scoped_ptr<content::DidOverscrollParams>, overscroll) +IPC_STRUCT_END() + // Sends an input event to the render widget. IPC_MESSAGE_ROUTED3(InputMsg_HandleInputEvent, IPC::WebInputEventPointer /* event */, @@ -118,11 +138,6 @@ IPC_MESSAGE_ROUTED0(InputMsg_MouseCaptureLost) IPC_MESSAGE_ROUTED1(InputMsg_SetFocus, bool /* enable */) -// Tells the renderer to focus the first (last if reverse is true) focusable -// node. -IPC_MESSAGE_ROUTED1(InputMsg_SetInitialFocus, - bool /* reverse */) - // Tells the renderer to scroll the currently focused node into rect only if // the currently focused node is a Text node (textfield, text area or content // editable divs). @@ -177,10 +192,8 @@ IPC_MESSAGE_ROUTED0(InputMsg_SyntheticGestureCompleted); // Messages sent from the renderer to the browser. // Acknowledges receipt of a InputMsg_HandleInputEvent message. -IPC_MESSAGE_ROUTED3(InputHostMsg_HandleInputEvent_ACK, - blink::WebInputEvent::Type, - content::InputEventAckState /* ack_result */, - ui::LatencyInfo /* latency_info */) +IPC_MESSAGE_ROUTED1(InputHostMsg_HandleInputEvent_ACK, + InputHostMsg_HandleInputEvent_ACK_Params) IPC_MESSAGE_ROUTED1(InputHostMsg_QueueSyntheticGesture, content::SyntheticGesturePacket) @@ -189,6 +202,11 @@ IPC_MESSAGE_ROUTED1(InputHostMsg_QueueSyntheticGesture, IPC_MESSAGE_ROUTED1(InputHostMsg_SetTouchAction, content::TouchAction /* touch_action */) +// Sent by the compositor when input scroll events are dropped due to bounds +// restrictions on the root scroll offset. +IPC_MESSAGE_ROUTED1(InputHostMsg_DidOverscroll, + content::DidOverscrollParams /* params */) + // Adding a new message? Stick to the sort order above: first platform // independent InputMsg, then ifdefs for platform specific InputMsg, then // platform independent InputHostMsg, then ifdefs for platform specific |