Index: content/common/input_messages.h |
diff --git a/content/common/input_messages.h b/content/common/input_messages.h |
index 2a7020ebf75f7c2ea9c910d64b9bdb75c63c6388..a971f47ef6ea00f671da479277083fe7c10a8f27 100644 |
--- a/content/common/input_messages.h |
+++ b/content/common/input_messages.h |
@@ -10,6 +10,11 @@ |
#include "content/common/content_export.h" |
#include "content/common/content_param_traits.h" |
#include "content/common/edit_command.h" |
+#include "content/common/input/input_event.h" |
+#include "content/common/input/input_event_disposition.h" |
+#include "content/common/input/input_param_traits.h" |
+#include "content/common/input/ipc_input_event_payload.h" |
+#include "content/common/input/event_packet.h" |
#include "content/port/common/input_event_ack_state.h" |
#include "content/public/common/common_param_traits.h" |
#include "ipc/ipc_message_macros.h" |
@@ -27,19 +32,35 @@ |
#define IPC_MESSAGE_START InputMsgStart |
+IPC_ENUM_TRAITS(content::InputEvent::Payload::Type) |
palmer
2013/09/03 23:12:47
IPC_ENUM_TRAITS() is deprecated; use IPC_ENUM_TRAI
jdduke (slow)
2013/09/04 17:53:24
Done.
|
IPC_ENUM_TRAITS(content::InputEventAckState) |
palmer
2013/09/03 23:12:47
Might as well change this one now, too.
jdduke (slow)
2013/09/04 17:53:24
Done.
|
+IPC_ENUM_TRAITS(content::InputEventDisposition) |
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::EventPacket) |
+ IPC_STRUCT_TRAITS_MEMBER(id) |
+ IPC_STRUCT_TRAITS_MEMBER(events) |
+IPC_STRUCT_TRAITS_END() |
+ |
+IPC_STRUCT_TRAITS_BEGIN(content::IPCInputEventPayload) |
+ IPC_STRUCT_TRAITS_MEMBER(message) |
+IPC_STRUCT_TRAITS_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 an event packet to the render widget. |
+IPC_MESSAGE_ROUTED2(InputMsg_HandleEventPacket, |
+ content::EventPacket /* event_packet */, |
+ content::InputEventDispositions /* dispositions */) |
+ |
// Sends the cursor visibility state to the render widget. |
IPC_MESSAGE_ROUTED1(InputMsg_CursorVisibilityChange, |
bool /* is_visible */) |
@@ -131,6 +152,10 @@ IPC_MESSAGE_ROUTED3(InputHostMsg_HandleInputEvent_ACK, |
content::InputEventAckState /* ack_result */, |
ui::LatencyInfo /* latency_info */) |
+IPC_MESSAGE_ROUTED2(InputHostMsg_HandleEventPacket_ACK, |
+ int64 /* event_packet_id */, |
+ content::InputEventDispositions /* dispositions */) |
+ |
// Adding a new message? Stick to the sort order above: first platform |
// independent InputMsg, then ifdefs for platform specific InputMsg, then |