Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1953)

Unified Diff: content/renderer/render_widget.cc

Issue 2741993003: Revert restartInput change off the M57 release branch. (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/render_widget.h ('k') | third_party/WebKit/Source/core/editing/InputMethodController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 57ef1fb90bad3bf8d681a5194445d16e7458c742..ac6f63108036e4bde831e5d6b142cfd7052e4c6e 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -1030,14 +1030,6 @@ void RenderWidget::ShowVirtualKeyboard() {
UpdateTextInputStateInternal(true, false);
}
-void RenderWidget::ClearTextInputState() {
- text_input_info_ = blink::WebTextInputInfo();
- text_input_type_ = ui::TextInputType::TEXT_INPUT_TYPE_NONE;
- text_input_mode_ = ui::TextInputMode::TEXT_INPUT_MODE_DEFAULT;
- can_compose_inline_ = false;
- text_input_flags_ = 0;
-}
-
void RenderWidget::UpdateTextInputState() {
UpdateTextInputStateInternal(false, false);
}
@@ -2099,6 +2091,13 @@ blink::WebScreenInfo RenderWidget::screenInfo() {
return web_screen_info;
}
+void RenderWidget::resetInputMethod() {
+ ImeEventGuard guard(this);
+ Send(new InputHostMsg_ImeCancelComposition(routing_id()));
+
+ UpdateCompositionInfo(false /* not an immediate request */);
+}
+
#if defined(OS_ANDROID)
void RenderWidget::showUnhandledTapUIIfNeeded(
const WebPoint& tapped_position,
« no previous file with comments | « content/renderer/render_widget.h ('k') | third_party/WebKit/Source/core/editing/InputMethodController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698