diff options
Diffstat (limited to 'chrome/common')
| -rw-r--r-- | chrome/common/render_messages_internal.h | 15 | ||||
| -rw-r--r-- | chrome/common/webkit_param_traits.h | 38 |
2 files changed, 42 insertions, 11 deletions
diff --git a/chrome/common/render_messages_internal.h b/chrome/common/render_messages_internal.h index e28eb51..1d99d61 100644 --- a/chrome/common/render_messages_internal.h +++ b/chrome/common/render_messages_internal.h @@ -371,11 +371,11 @@ IPC_BEGIN_MESSAGES(View) // * ime_string (std::wstring) // Represents the string retrieved from IME (Input Method Editor) IPC_MESSAGE_ROUTED5(ViewMsg_ImeSetComposition, - int, /* string_type */ + WebKit::WebCompositionCommand, /* command */ int, /* cursor_position */ int, /* target_start */ int, /* target_end */ - std::wstring /* ime_string */ ) + string16 /* ime_string */ ) // This passes a set of webkit preferences down to the renderer. IPC_MESSAGE_ROUTED1(ViewMsg_UpdateWebPreferences, WebPreferences) @@ -568,16 +568,9 @@ IPC_BEGIN_MESSAGES(View) std::string /* extension_id */, std::vector<std::string> /* page_action_ids */) - // Changes the text direction of a selected input field. - // * direction (int) - // Represents the new text direction. - // Its possible values are listed below: - // Value New Text Direction - // WEB_TEXT_DIRECTION_DEFAULT NaturalWritingDirection ("inherit") - // WEB_TEXT_DIRECTION_LTR LeftToRightWritingDirection ("rtl") - // WEB_TEXT_DIRECTION_RTL RightToLeftWritingDirection ("ltr") + // Changes the text direction of the currently selected input field (if any). IPC_MESSAGE_ROUTED1(ViewMsg_SetTextDirection, - int /* direction */) + WebKit::WebTextDirection /* direction */) // Tells the renderer to clear the focused node (if any). IPC_MESSAGE_ROUTED0(ViewMsg_ClearFocusedNode) diff --git a/chrome/common/webkit_param_traits.h b/chrome/common/webkit_param_traits.h index 733694a..1263285 100644 --- a/chrome/common/webkit_param_traits.h +++ b/chrome/common/webkit_param_traits.h @@ -25,10 +25,12 @@ #include "chrome/common/ipc_message_utils.h" #include "webkit/api/public/WebCache.h" +#include "webkit/api/public/WebCompositionCommand.h" #include "webkit/api/public/WebConsoleMessage.h" #include "webkit/api/public/WebFindOptions.h" #include "webkit/api/public/WebInputEvent.h" #include "webkit/api/public/WebScreenInfo.h" +#include "webkit/api/public/WebTextDirection.h" namespace IPC { @@ -95,6 +97,24 @@ struct ParamTraits<WebKit::WebScreenInfo> { }; template <> +struct ParamTraits<WebKit::WebCompositionCommand> { + typedef WebKit::WebCompositionCommand param_type; + static void Write(Message* m, const param_type& p) { + WriteParam(m, static_cast<int>(p)); + } + static bool Read(const Message* m, void** iter, param_type* r) { + int value; + if (!ReadParam(m, iter, &value)) + return false; + *r = static_cast<param_type>(value); + return true; + } + static void Log(const param_type& p, std::wstring* l) { + LogParam(static_cast<int>(p), l); + } +}; + +template <> struct ParamTraits<WebKit::WebConsoleMessage::Level> { typedef WebKit::WebConsoleMessage::Level param_type; static void Write(Message* m, const param_type& p) { @@ -264,6 +284,24 @@ struct ParamTraits<WebKit::WebCache::ResourceTypeStats> { } }; +template <> +struct ParamTraits<WebKit::WebTextDirection> { + typedef WebKit::WebTextDirection param_type; + static void Write(Message* m, const param_type& p) { + WriteParam(m, static_cast<int>(p)); + } + static bool Read(const Message* m, void** iter, param_type* r) { + int value; + if (!ReadParam(m, iter, &value)) + return false; + *r = static_cast<param_type>(value); + return true; + } + static void Log(const param_type& p, std::wstring* l) { + LogParam(static_cast<int>(p), l); + } +}; + } // namespace IPC #endif // CHROME_COMMON_WEBKIT_PARAM_TRAITS_H_ |