diff options
| author | shuchen <shuchen@chromium.org> | 2014-10-14 20:55:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-15 03:56:53 +0000 |
| commit | 3517bb6c601efad861dddcf01a16e2c68bf927c7 (patch) | |
| tree | c6b0f49389e10cd95b5d3d0297125103848827ba /content/browser/browser_plugin/browser_plugin_guest.cc | |
| parent | 8b00232f85e2bc98831dfdbf6e7d22d9aa4b7ac0 (diff) | |
| download | chromium_src-3517bb6c601efad861dddcf01a16e2c68bf927c7.zip chromium_src-3517bb6c601efad861dddcf01a16e2c68bf927c7.tar.gz chromium_src-3517bb6c601efad861dddcf01a16e2c68bf927c7.tar.bz2 | |
Revert "Merge ViewHostMsg_TextInputTypeChanged and ViewHostMsg_TextInputStateChanged into one."
This reverts commit 2dd467c5edc6a802877f9a582a4278b5c5332dbd.
https://codereview.chromium.org/326403002/
Conflicts:
content/browser/browser_plugin/browser_plugin_guest.cc
content/browser/browser_plugin/browser_plugin_guest.h
content/browser/frame_host/render_widget_host_view_child_frame.cc
content/browser/frame_host/render_widget_host_view_child_frame.h
content/browser/frame_host/render_widget_host_view_guest.h
content/browser/renderer_host/render_widget_host_impl.cc
content/browser/renderer_host/render_widget_host_impl.h
content/browser/renderer_host/render_widget_host_view_android.h
content/browser/renderer_host/render_widget_host_view_aura.h
content/browser/renderer_host/render_widget_host_view_base.h
content/browser/renderer_host/render_widget_host_view_mac.h
content/common/view_messages.h
content/renderer/render_frame_impl.cc
content/renderer/render_widget.cc
content/test/test_render_view_host.h
BUG=417152
TEST=None
Review URL: https://codereview.chromium.org/634313007
Cr-Commit-Position: refs/heads/master@{#299646}
Diffstat (limited to 'content/browser/browser_plugin/browser_plugin_guest.cc')
| -rw-r--r-- | content/browser/browser_plugin/browser_plugin_guest.cc | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/content/browser/browser_plugin/browser_plugin_guest.cc b/content/browser/browser_plugin/browser_plugin_guest.cc index 09326d1..ffdf00d 100644 --- a/content/browser/browser_plugin/browser_plugin_guest.cc +++ b/content/browser/browser_plugin/browser_plugin_guest.cc @@ -121,11 +121,8 @@ void BrowserPluginGuest::SetFocus(RenderWidgetHost* rwh, bool focused) { RenderWidgetHostViewBase* rwhv = static_cast<RenderWidgetHostViewBase*>( rwh->GetView()); if (rwhv) { - ViewHostMsg_TextInputState_Params params; - params.type = last_text_input_type_; - params.mode = last_input_mode_; - params.can_compose_inline = last_can_compose_inline_; - rwhv->TextInputStateChanged(params); + rwhv->TextInputTypeChanged(last_text_input_type_, last_input_mode_, + last_can_compose_inline_); } } @@ -496,8 +493,8 @@ bool BrowserPluginGuest::OnMessageReceived(const IPC::Message& message) { IPC_MESSAGE_HANDLER(ViewHostMsg_LockMouse, OnLockMouse) IPC_MESSAGE_HANDLER(ViewHostMsg_ShowWidget, OnShowWidget) IPC_MESSAGE_HANDLER(ViewHostMsg_TakeFocus, OnTakeFocus) - IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputStateChanged, - OnTextInputStateChanged) + IPC_MESSAGE_HANDLER(ViewHostMsg_TextInputTypeChanged, + OnTextInputTypeChanged) IPC_MESSAGE_HANDLER(ViewHostMsg_UnlockMouse, OnUnlockMouse) IPC_MESSAGE_UNHANDLED(handled = false) IPC_END_MESSAGE_MAP() @@ -802,15 +799,17 @@ void BrowserPluginGuest::OnTakeFocus(bool reverse) { new BrowserPluginMsg_AdvanceFocus(browser_plugin_instance_id(), reverse)); } -void BrowserPluginGuest::OnTextInputStateChanged( - const ViewHostMsg_TextInputState_Params& params) { +void BrowserPluginGuest::OnTextInputTypeChanged(ui::TextInputType type, + ui::TextInputMode input_mode, + bool can_compose_inline) { // Save the state of text input so we can restore it on focus. - last_text_input_type_ = params.type; - last_input_mode_ = params.mode; - last_can_compose_inline_ = params.can_compose_inline; + last_text_input_type_ = type; + last_input_mode_ = input_mode; + last_can_compose_inline_ = can_compose_inline; static_cast<RenderWidgetHostViewBase*>( - web_contents()->GetRenderWidgetHostView())->TextInputStateChanged(params); + web_contents()->GetRenderWidgetHostView())->TextInputTypeChanged( + type, input_mode, can_compose_inline); } void BrowserPluginGuest::OnImeCancelComposition() { |