Bundle DidOverscrollParams with the InputEventAck

content/common/input_messages.h

Index: content/common/input_messages.h
diff --git a/content/common/input_messages.h b/content/common/input_messages.h
index df67c713d543e5b355dc0d77ac6b300cfb3f7f8d..37afe4f00fb21303b466169d705e54ab253e56e4 100644
--- a/content/common/input_messages.h
+++ b/content/common/input_messages.h
@@ -10,7 +10,9 @@
 #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.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"
@@ -25,6 +27,7 @@
 #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
@@ -51,6 +54,12 @@ IPC_ENUM_TRAITS_VALIDATE(content::TouchAction, (
     (!(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)
@@ -62,6 +71,13 @@ IPC_STRUCT_TRAITS_BEGIN(content::InputEvent)
   IPC_STRUCT_TRAITS_MEMBER(is_keyboard_shortcut)
 IPC_STRUCT_TRAITS_END()
 
+IPC_STRUCT_TRAITS_BEGIN(content::InputEventAck)
+  IPC_STRUCT_TRAITS_MEMBER(type)
+  IPC_STRUCT_TRAITS_MEMBER(state)
+  IPC_STRUCT_TRAITS_MEMBER(latency)
+  IPC_STRUCT_TRAITS_MEMBER(overscroll)
+IPC_STRUCT_TRAITS_END()
+
 IPC_STRUCT_TRAITS_BEGIN(content::SyntheticGestureParams)
   IPC_STRUCT_TRAITS_MEMBER(gesture_source_type)
 IPC_STRUCT_TRAITS_END()
@@ -177,10 +193,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,
+                    content::InputEventAck /* ack */)
 
 IPC_MESSAGE_ROUTED1(InputHostMsg_QueueSyntheticGesture,
                     content::SyntheticGesturePacket)
@@ -189,6 +203,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