Revert 266967 "Merge 266651 "linux-aura: Supports Compose key wi..."

branches/1916/src/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gdk/gdkx.h>
 
@@ skipping 81 matching lines @@
 
 }  // namespace
 
 namespace libgtk2ui {
 
 X11InputMethodContextImplGtk2::X11InputMethodContextImplGtk2(
     ui::LinuxInputMethodContextDelegate* delegate)
     : delegate_(delegate),
       gtk_context_simple_(NULL),
       gtk_multicontext_(NULL),
-      gtk_context_(NULL),
-      gdk_last_set_client_window_(NULL) {
+      gtk_context_(NULL) {
   CHECK(delegate_);
 
   {
     XModifierKeymap* keymap = XGetModifierMapping(
         base::MessagePumpForUI::GetDefaultXDisplay());
     for (int i = 0; i < 8 * keymap->max_keypermod; ++i) {
       if (keymap->modifiermap[i])
         modifier_keycodes_.insert(keymap->modifiermap[i]);
     }
     XFreeModifiermap(keymap);
@@ skipping 45 matching lines @@
   const base::NativeEvent& native_key_event = key_event.native_event();
   GdkEvent* event = GdkEventFromXKeyEvent(
       native_key_event->xkey,
       IsKeycodeModifierKey(native_key_event->xkey.keycode));
   if (!event) {
     LOG(ERROR) << "Cannot translate a XKeyEvent to a GdkEvent.";
     return false;
   }
 
   // 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;
   gint y = 0;
   gdk_window_get_origin(event->key.window, &x, &y);
   GdkRectangle rect = {last_caret_bounds_.x() - x,
                        last_caret_bounds_.y() - y,
                        last_caret_bounds_.width(),
                        last_caret_bounds_.height()};
   gtk_im_context_set_cursor_location(gtk_context_, &rect);
 
   // Let an IME handle the key event.
   commit_signal_trap_.StartTrap(event->key.keyval);
   const gboolean handled = gtk_im_context_filter_keypress(gtk_context_,
                                                           &event->key);
   commit_signal_trap_.StopTrap();
   gdk_event_free(event);
 
   return handled && !commit_signal_trap_.IsSignalCaught();
 }
 
 void X11InputMethodContextImplGtk2::Reset() {
   // Reset all the states of the context, not only preedit, caret but also
   // focus.
   gtk_context_ = NULL;
   gtk_im_context_reset(gtk_context_simple_);
   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(
     ui::TextInputType text_input_type) {
   switch (text_input_type) {
     case ui::TEXT_INPUT_TYPE_NONE:
     case ui::TEXT_INPUT_TYPE_PASSWORD:
       gtk_context_ = gtk_context_simple_;
       break;
     default:
@@ skipping 94 matching lines @@
       text.length() == 1 &&
       text[0] == gdk_keyval_to_unicode(gdk_event_key_keyval_)) {
     is_signal_caught_ = true;
     return true;
   } else {
     return false;
   }
 }
 
 }  // namespace libgtk2ui