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

Unified Diff: content/renderer/render_widget.cc

Issue 1234193002: Simplify InputMethodWin initialization. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 5 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') | mandoline/ui/aura/input_method_mandoline.h » ('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 d0a6ca3df3f0ba043ec98ea153ae6b26af675688..6a999454234d908176970ab7436640f0bda6b09a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -499,7 +499,6 @@ RenderWidget::RenderWidget(blink::WebPopupType popup_type,
host_closing_(false),
is_swapped_out_(swapped_out),
for_oopif_(false),
- input_method_is_active_(false),
text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
text_input_mode_(ui::TEXT_INPUT_MODE_DEFAULT),
text_input_flags_(0),
@@ -728,7 +727,6 @@ bool RenderWidget::OnMessageReceived(const IPC::Message& message) {
IPC_MESSAGE_HANDLER(ViewMsg_ChangeResizeRect, OnChangeResizeRect)
IPC_MESSAGE_HANDLER(ViewMsg_WasHidden, OnWasHidden)
IPC_MESSAGE_HANDLER(ViewMsg_WasShown, OnWasShown)
- IPC_MESSAGE_HANDLER(ViewMsg_SetInputMethodActive, OnSetInputMethodActive)
IPC_MESSAGE_HANDLER(ViewMsg_Repaint, OnRepaint)
IPC_MESSAGE_HANDLER(ViewMsg_SetTextDirection, OnSetTextDirection)
IPC_MESSAGE_HANDLER(ViewMsg_Move_ACK, OnRequestMoveAck)
@@ -1662,13 +1660,6 @@ WebRect RenderWidget::windowResizerRect() {
return resizer_rect_;
}
-void RenderWidget::OnSetInputMethodActive(bool is_active) {
- // To prevent this renderer process from sending unnecessary IPC messages to
- // a browser process, we permit the renderer process to send IPC messages
- // only during the input method attached to the browser process is active.
- input_method_is_active_ = is_active;
-}
-
void RenderWidget::OnImeSetComposition(
const base::string16& text,
const std::vector<WebCompositionUnderline>& underlines,
@@ -1910,17 +1901,6 @@ void RenderWidget::FinishHandlingImeEvent() {
}
void RenderWidget::UpdateTextInputType() {
- // On Windows, not only an IME but also an on-screen keyboard relies on the
- // latest TextInputType to optimize its layout and functionality. Thus
- // |input_method_is_active_| is no longer an appropriate condition to suppress
- // TextInputTypeChanged IPC on Windows.
- // TODO(yukawa, yoichio): Consider to stop checking |input_method_is_active_|
- // on other platforms as well as Windows if the overhead is acceptable.
-#if !defined(OS_WIN)
- if (!input_method_is_active_)
- return;
-#endif
jdduke (slow) 2015/07/22 20:40:59 It would be really nice if we could reland your me
Shu Chen 2015/07/23 00:57:46 CL https://codereview.chromium.org/326403002 got r
-
ui::TextInputType new_type = GetTextInputType();
if (IsDateTimeInput(new_type))
return; // Not considered as a text input field in WebKit/Chromium.
@@ -1954,8 +1934,6 @@ void RenderWidget::UpdateTextInputState(ShowIme show_ime,
ChangeSource change_source) {
if (handling_ime_event_)
return;
- if (show_ime == NO_SHOW_IME && !input_method_is_active_)
- return;
ui::TextInputType new_type = GetTextInputType();
if (IsDateTimeInput(new_type))
return; // Not considered as a text input field in WebKit/Chromium.
@@ -2180,9 +2158,6 @@ float RenderWidget::deviceScaleFactor() {
}
void RenderWidget::resetInputMethod() {
- if (!input_method_is_active_)
- return;
-
ImeEventGuard guard(this);
// If the last text input type is not None, then we should finish any
// ongoing composition regardless of the new text input type.
« no previous file with comments | « content/renderer/render_widget.h ('k') | mandoline/ui/aura/input_method_mandoline.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698