Add InputEvent and EventPacket types for batched input delivery

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 2a7020ebf75f7c2ea9c910d64b9bdb75c63c6388..e3e8dbf29fb7142dd8b94b45fd5e1db0be165e4d 100644
--- a/content/common/input_messages.h
+++ b/content/common/input_messages.h
@@ -10,6 +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/event_packet.h"
+#include "content/common/input/input_event.h"
+#include "content/common/input/input_event_state.h"
 #include "content/port/common/input_event_ack_state.h"
 #include "content/public/common/common_param_traits.h"
 #include "ipc/ipc_message_macros.h"
@@ -28,12 +31,26 @@
 #define IPC_MESSAGE_START InputMsgStart
 
 IPC_ENUM_TRAITS(content::InputEventAckState)
+IPC_ENUM_TRAITS(content::InputEventState)
+IPC_ENUM_TRAITS(content::InputEventType)
 
 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(id)
+  IPC_STRUCT_TRAITS_MEMBER(type)
+  IPC_STRUCT_TRAITS_MEMBER(message)
+  IPC_STRUCT_TRAITS_MEMBER(state)
+IPC_STRUCT_TRAITS_END()
+
+IPC_STRUCT_TRAITS_BEGIN(content::EventPacket)
+  IPC_STRUCT_TRAITS_MEMBER(id)
+  IPC_STRUCT_TRAITS_MEMBER(events)
+IPC_STRUCT_TRAITS_END()
+
 // Sends an input event to the render widget.
 IPC_MESSAGE_ROUTED3(InputMsg_HandleInputEvent,
                     IPC::WebInputEventPointer /* event */,
@@ -113,6 +130,9 @@ IPC_MESSAGE_ROUTED2(InputMsg_SelectRange,
 IPC_MESSAGE_ROUTED1(InputMsg_MoveCaret,
                     gfx::Point /* location */)
 
+IPC_MESSAGE_ROUTED1(InputMsg_HandleEventPacket,
+                    content::EventPacket /* packet */)
+
 #if defined(OS_ANDROID)
 // Sent when the user clicks on the find result bar to activate a find result.
 // The point (x,y) is in fractions of the content document's width and height.
@@ -131,6 +151,10 @@ IPC_MESSAGE_ROUTED3(InputHostMsg_HandleInputEvent_ACK,
                     content::InputEventAckState /* ack_result */,
                     ui::LatencyInfo /* latency_info */)
 
+// Acknowledges receipt of a InputMsg_HandleEventPacket message.
+IPC_MESSAGE_ROUTED1(InputHostMsg_HandleEventPacket_ACK,
+                    content::EventPacket /* acked_packet */)
+
 
 // Adding a new message? Stick to the sort order above: first platform
 // independent InputMsg, then ifdefs for platform specific InputMsg, then