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 acc1c8ad45e77343ce27625da97fbecbb50dacec..0f51908312595987a2299244a3fd0e0f1acf50f2 100644 |
--- a/content/browser/renderer_host/render_widget_host_view_mac.mm |
+++ b/content/browser/renderer_host/render_widget_host_view_mac.mm |
@@ -1016,24 +1016,20 @@ 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::NotifyTextInputStateChanged() { |
+ RenderWidgetHostViewBase::NotifyTextInputStateChanged(); |
+ |
+ 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(), |
+ !GetCurrentTextInputState()->can_compose_inline_); |
kenrb
2016/02/01 20:12:43
Wrong method name? (Related, you might want to run
EhsanK
2016/02/12 15:47:00
Done. Sorry for this. I did run this on all _rel_
|
#endif |
- } |
- } |
} |
void RenderWidgetHostViewMac::ImeCancelComposition() { |