Bundle DidOverscrollParams with the InputEventAck

content/common/input_messages.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // IPC messages for input events and other messages that require processing in
 // order relative to input events.
 // Multiply-included message file, hence no include guard.
 
 #include "base/strings/string16.h"
 #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/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/gfx/point.h"
 #include "ui/gfx/rect.h"
+#include "ui/gfx/vector2d_f.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 
 #ifdef IPC_MESSAGE_START
 #error IPC_MESSAGE_START
 #endif
 
 #define IPC_MESSAGE_START InputMsgStart
 
 IPC_ENUM_TRAITS_MAX_VALUE(content::InputEventAckState,
                           content::INPUT_EVENT_ACK_STATE_MAX)
 IPC_ENUM_TRAITS_MAX_VALUE(
     content::SyntheticGestureParams::GestureSourceType,
     content::SyntheticGestureParams::GESTURE_SOURCE_TYPE_MAX)
 IPC_ENUM_TRAITS_MAX_VALUE(
     content::SyntheticGestureParams::GestureType,
     content::SyntheticGestureParams::SYNTHETIC_GESTURE_TYPE_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)
   IPC_STRUCT_TRAITS_MEMBER(value)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::InputEvent)
   IPC_STRUCT_TRAITS_MEMBER(web_event)
   IPC_STRUCT_TRAITS_MEMBER(latency_info)
   IPC_STRUCT_TRAITS_MEMBER(is_keyboard_shortcut)
 IPC_STRUCT_TRAITS_END()
@@ skipping 17 matching lines @@
   IPC_STRUCT_TRAITS_MEMBER(anchor)
   IPC_STRUCT_TRAITS_MEMBER(relative_pointer_speed_in_pixels_s)
 IPC_STRUCT_TRAITS_END()
 
 IPC_STRUCT_TRAITS_BEGIN(content::SyntheticTapGestureParams)
   IPC_STRUCT_TRAITS_PARENT(content::SyntheticGestureParams)
   IPC_STRUCT_TRAITS_MEMBER(position)
   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 */,
                     ui::LatencyInfo /* latency_info */,
                     bool /* is_keyboard_shortcut */)
 
 // Sends the cursor visibility state to the render widget.
 IPC_MESSAGE_ROUTED1(InputMsg_CursorVisibilityChange,
                     bool /* is_visible */)
 
@@ skipping 69 matching lines @@
                     float /* x */,
                     float /* y */)
 #endif
 
 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)
 
 // Notifies the allowed touch actions for a new touch point.
 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
 // InputHostMsg.