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

Unified Diff: content/renderer/ime_event_guard.cc

Issue 1278593004: Introduce ThreadedInputConnection behind a switch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: removed ImeTest#testDoesNotHang_rendererCrashes which does not test anything Created 4 years, 10 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
Index: content/renderer/ime_event_guard.cc
diff --git a/content/renderer/ime_event_guard.cc b/content/renderer/ime_event_guard.cc
index aaed1712a7be85267fe7f7c1fe6e20445593ea3c..668c531a5f6002c8354debbadc32ea9b15bf34d5 100644
--- a/content/renderer/ime_event_guard.cc
+++ b/content/renderer/ime_event_guard.cc
@@ -8,14 +8,13 @@
namespace content {
+// When ThreadedInputConnection is used, we want to make sure that FROM_IME
+// is set only for OnRequestTextInputStateUpdate() so that we can distinguish
+// it from other updates so that we can wait for it safely. So it is false by
+// default.
ImeEventGuard::ImeEventGuard(RenderWidget* widget)
- : ImeEventGuard(widget, false, true) {
-}
-
-ImeEventGuard::ImeEventGuard(RenderWidget* widget, bool show_ime, bool from_ime)
- : widget_(widget),
- show_ime_(show_ime),
- from_ime_(from_ime) {
+ : widget_(widget), show_ime_(false),
+ from_ime_(!widget->IsUsingImeThread()) {
widget_->OnImeEventGuardStart(this);
}

Powered by Google App Engine
This is Rietveld 408576698