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

Unified Diff: branches/1916/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc

Issue 253183002: Revert 266967 "Merge 266651 "linux-aura: Supports Compose key wi..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 8 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: branches/1916/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc
===================================================================
--- branches/1916/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc (revision 266977)
+++ branches/1916/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc (working copy)
@@ -99,8 +99,7 @@
: delegate_(delegate),
gtk_context_simple_(NULL),
gtk_multicontext_(NULL),
- gtk_context_(NULL),
- gdk_last_set_client_window_(NULL) {
+ gtk_context_(NULL) {
CHECK(delegate_);
{
@@ -166,10 +165,7 @@
}
// Set the client window and cursor location.
- if (event->key.window != gdk_last_set_client_window_) {
- gtk_im_context_set_client_window(gtk_context_, event->key.window);
- gdk_last_set_client_window_ = event->key.window;
- }
+ gtk_im_context_set_client_window(gtk_context_, event->key.window);
// Convert the last known caret bounds relative to the screen coordinates
// to a GdkRectangle relative to the client window.
gint x = 0;
@@ -199,7 +195,6 @@
gtk_im_context_reset(gtk_multicontext_);
gtk_im_context_focus_out(gtk_context_simple_);
gtk_im_context_focus_out(gtk_multicontext_);
- gdk_last_set_client_window_ = NULL;
}
void X11InputMethodContextImplGtk2::OnTextInputTypeChanged(

Powered by Google App Engine
This is Rietveld 408576698