| Index: content/common/view_messages.h
|
| diff --git a/content/common/view_messages.h b/content/common/view_messages.h
|
| index 8ced96a7472092f974506f4498cdb566320695ec..918691d7cdb5a1742178d1e01757d3862771cd01 100644
|
| --- a/content/common/view_messages.h
|
| +++ b/content/common/view_messages.h
|
| @@ -23,6 +23,7 @@
|
| #include "content/common/media/media_param_traits.h"
|
| #include "content/common/navigation_gesture.h"
|
| #include "content/common/resize_params.h"
|
| +#include "content/common/text_input_state.h"
|
| #include "content/common/view_message_enums.h"
|
| #include "content/common/webplugin_geometry.h"
|
| #include "content/public/common/common_param_traits.h"
|
| @@ -292,6 +293,20 @@ IPC_STRUCT_TRAITS_BEGIN(media::MediaLogEvent)
|
| IPC_STRUCT_TRAITS_MEMBER(time)
|
| IPC_STRUCT_TRAITS_END()
|
|
|
| +IPC_STRUCT_TRAITS_BEGIN(content::TextInputState)
|
| + IPC_STRUCT_TRAITS_MEMBER(type)
|
| + IPC_STRUCT_TRAITS_MEMBER(mode)
|
| + IPC_STRUCT_TRAITS_MEMBER(flags)
|
| + IPC_STRUCT_TRAITS_MEMBER(value)
|
| + IPC_STRUCT_TRAITS_MEMBER(selection_start)
|
| + IPC_STRUCT_TRAITS_MEMBER(selection_end)
|
| + IPC_STRUCT_TRAITS_MEMBER(composition_start)
|
| + IPC_STRUCT_TRAITS_MEMBER(composition_end)
|
| + IPC_STRUCT_TRAITS_MEMBER(can_compose_inline)
|
| + IPC_STRUCT_TRAITS_MEMBER(show_ime_if_needed)
|
| + IPC_STRUCT_TRAITS_MEMBER(is_non_ime_change)
|
| +IPC_STRUCT_TRAITS_END()
|
| +
|
| IPC_STRUCT_BEGIN(ViewHostMsg_CreateWindow_Params)
|
| // Routing ID of the view initiating the open.
|
| IPC_STRUCT_MEMBER(int, opener_id)
|
| @@ -413,45 +428,6 @@ IPC_STRUCT_BEGIN(ViewHostMsg_SelectionBounds_Params)
|
| IPC_STRUCT_MEMBER(bool, is_anchor_first)
|
| IPC_STRUCT_END()
|
|
|
| -IPC_STRUCT_BEGIN(ViewHostMsg_TextInputState_Params)
|
| - // The type of input field
|
| - IPC_STRUCT_MEMBER(ui::TextInputType, type)
|
| -
|
| - // The mode of input field
|
| - IPC_STRUCT_MEMBER(ui::TextInputMode, mode)
|
| -
|
| - // The flags of the input field (autocorrect, autocomplete, etc.)
|
| - IPC_STRUCT_MEMBER(int, flags)
|
| -
|
| - // The value of the input field
|
| - IPC_STRUCT_MEMBER(std::string, value)
|
| -
|
| - // The cursor position of the current selection start, or the caret position
|
| - // if nothing is selected
|
| - IPC_STRUCT_MEMBER(int, selection_start)
|
| -
|
| - // The cursor position of the current selection end, or the caret position
|
| - // if nothing is selected
|
| - IPC_STRUCT_MEMBER(int, selection_end)
|
| -
|
| - // The start position of the current composition, or -1 if there is none
|
| - IPC_STRUCT_MEMBER(int, composition_start)
|
| -
|
| - // The end position of the current composition, or -1 if there is none
|
| - IPC_STRUCT_MEMBER(int, composition_end)
|
| -
|
| - // Whether or not inline composition can be performed for the current input.
|
| - IPC_STRUCT_MEMBER(bool, can_compose_inline)
|
| -
|
| - // Whether or not the IME should be shown as a result of this update. Even if
|
| - // true, the IME will only be shown if the type is appropriate (e.g. not
|
| - // TEXT_INPUT_TYPE_NONE).
|
| - IPC_STRUCT_MEMBER(bool, show_ime_if_needed)
|
| -
|
| - // Whether this change is originated from non-IME (e.g. Javascript, Autofill).
|
| - IPC_STRUCT_MEMBER(bool, is_non_ime_change)
|
| -IPC_STRUCT_END()
|
| -
|
| IPC_STRUCT_BEGIN(ViewHostMsg_UpdateRect_Params)
|
| // The size of the RenderView when this message was generated. This is
|
| // included so the host knows how large the view is from the perspective of
|
| @@ -1177,7 +1153,7 @@ IPC_MESSAGE_ROUTED1(ViewHostMsg_OpenDateTimeDialog,
|
|
|
| // Required for updating text input state.
|
| IPC_MESSAGE_ROUTED1(ViewHostMsg_TextInputStateChanged,
|
| - ViewHostMsg_TextInputState_Params /* input state params */)
|
| + content::TextInputState /* input state */)
|
|
|
| // Sent when the renderer changes the zoom level for a particular url, so the
|
| // browser can update its records. If the view is a plugin doc, then url is
|
|
|