| Index: content/renderer/render_widget.cc
|
| diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
|
| index d67bdfefac27d770dddd63fc56b0255b902adbe3..f25fa82c1ad78cffa9a3fd4caeadb67117cd1a80 100644
|
| --- a/content/renderer/render_widget.cc
|
| +++ b/content/renderer/render_widget.cc
|
| @@ -1033,8 +1033,8 @@
|
| return; // Not considered as a text input field in WebKit/Chromium.
|
|
|
| blink::WebTextInputInfo new_info;
|
| - if (auto* controller = GetInputMethodController())
|
| - new_info = controller->textInputInfo();
|
| + if (GetWebWidget())
|
| + new_info = GetWebWidget()->textInputInfo();
|
| const ui::TextInputMode new_mode =
|
| ConvertWebTextInputMode(new_info.inputMode);
|
|
|
| @@ -1728,8 +1728,8 @@
|
| if (focused_pepper_plugin_)
|
| return focused_pepper_plugin_->text_input_type();
|
| #endif
|
| - if (auto* controller = GetInputMethodController())
|
| - return ConvertWebTextInputType(controller->textInputType());
|
| + if (GetWebWidget())
|
| + return ConvertWebTextInputType(GetWebWidget()->textInputType());
|
| return ui::TEXT_INPUT_TYPE_NONE;
|
| }
|
|
|
| @@ -2110,8 +2110,7 @@
|
| UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME);
|
| } else if (event.type == WebInputEvent::GestureLongPress) {
|
| DCHECK(GetWebWidget());
|
| - blink::WebInputMethodController* controller = GetInputMethodController();
|
| - if (!controller || controller->textInputInfo().value.isEmpty())
|
| + if (GetWebWidget()->textInputInfo().value.isEmpty())
|
| UpdateTextInputState(ShowIme::HIDE_IME, ChangeSource::FROM_NON_IME);
|
| else
|
| UpdateTextInputState(ShowIme::IF_NEEDED, ChangeSource::FROM_NON_IME);
|
|
|