Index: content/browser/renderer_host/render_widget_host_view_mac.mm |
diff --git a/content/browser/renderer_host/render_widget_host_view_mac.mm b/content/browser/renderer_host/render_widget_host_view_mac.mm |
index 96e472e3b84f74bad9a67658a12a5ea243c985fa..401cb67c95610db143125361d8cdaac93383ed63 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm |
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm |
@@ -1017,23 +1017,23 @@ void RenderWidgetHostViewMac::SetIsLoading(bool is_loading) { |
// like Chrome does on Windows, call |UpdateCursor()| here. |
} |
-void RenderWidgetHostViewMac::TextInputStateChanged( |
-const ViewHostMsg_TextInputState_Params& params) { |
- if (text_input_type_ != params.type |
- || can_compose_inline_ != params.can_compose_inline) { |
- text_input_type_ = params.type; |
- can_compose_inline_ = params.can_compose_inline; |
- if (HasFocus()) { |
- SetTextInputActive(true); |
- |
- // Let AppKit cache the new input context to make IMEs happy. |
- // See http://crbug.com/73039. |
- [NSApp updateWindows]; |
+void RenderWidgetHostViewMac::UpdateInputMethodIfNecessary( |
+ bool text_input_state_changed) { |
+ if (!text_input_state_changed) |
+ return; |
+ |
+ if (HasFocus()) { |
+ SetTextInputActive(true); |
+ |
+ // Let AppKit cache the new input context to make IMEs happy. |
+ // See http://crbug.com/73039. |
+ [NSApp updateWindows]; |
#ifndef __LP64__ |
- UseInputWindow(TSMGetActiveDocument(), !can_compose_inline_); |
+ UseInputWindow(TSMGetActiveDocument(), !render_widget_host_->delegate() |
+ ->GetTextInputState() |
+ .can_compose_inline); |
#endif |
- } |
} |
} |