| 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 6cd3067aa74d11f04de0098a0c8d1ccbd84fc3bf..0ec6ad37eb3726186dbb296359400816f0b33e61 100644
|
| --- a/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| +++ b/content/browser/renderer_host/render_widget_host_view_mac.mm
|
| @@ -1015,13 +1015,6 @@
|
| if (!text_input_state_changed)
|
| return;
|
|
|
| - // TODO(ekaramad): The state tracking is all in WebContentsImpl now. Remove
|
| - // these member variables (crbug.com/602427).
|
| - const TextInputState* state =
|
| - render_widget_host_->delegate()->GetTextInputState();
|
| - text_input_type_ = state->type;
|
| - can_compose_inline_ = state->can_compose_inline;
|
| -
|
| if (HasFocus()) {
|
| SetTextInputActive(true);
|
|
|
| @@ -1030,7 +1023,9 @@
|
| [NSApp updateWindows];
|
|
|
| #ifndef __LP64__
|
| - UseInputWindow(TSMGetActiveDocument(), !can_compose_inline_);
|
| + UseInputWindow(TSMGetActiveDocument(), !render_widget_host_->delegate()
|
| + ->GetTextInputState()
|
| + ->can_compose_inline);
|
| #endif
|
| }
|
| }
|
|
|