| Index: content/common/input_messages.h
|
| diff --git a/content/common/input_messages.h b/content/common/input_messages.h
|
| index 2a7020ebf75f7c2ea9c910d64b9bdb75c63c6388..5e6dd255bcb732684a1be79c11f49b0ad9bc8554 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,33 @@
|
|
|
| #define IPC_MESSAGE_START InputMsgStart
|
|
|
| -IPC_ENUM_TRAITS(content::InputEventAckState)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(content::InputEvent::Payload::Type,
|
| + content::InputEvent::Payload::PAYLOAD_TYPE_MAX)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(content::InputEventAckState,
|
| + content::INPUT_EVENT_ACK_STATE_MAX)
|
| +IPC_ENUM_TRAITS_MAX_VALUE(content::InputEventDisposition,
|
| + content::INPUT_EVENT_DISPOSITION_MAX)
|
|
|
| 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::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 +150,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
|
|
|