[cros] Fix two issues related to gtk im context support.

chrome/browser/renderer_host/gtk_im_context_wrapper.cc

 // Copyright (c) 2010 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/renderer_host/gtk_im_context_wrapper.h"
 
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
 #include <gtk/gtk.h>
 #include <algorithm>
@@ skipping 437 matching lines @@
   // handler, which will send commit text to webkit later. Otherwise,
   // we need send it here.
   // It's possible that commit signal is fired without a key event, for
   // example when user input via a voice or handwriting recognition software.
   // In this case, the text must be committed directly.
   if (!is_in_key_event_handler_ && host_view_->GetRenderWidgetHost())
     host_view_->GetRenderWidgetHost()->ImeConfirmComposition(text);
 }
 
 void GtkIMContextWrapper::HandlePreeditStart() {
-  is_composing_text_ = true;
+  // Ignore preedit related signals triggered by CancelComposition() method.
+  if (!suppress_next_commit_)

[satorux1, 2010/11/24 01:56:05]

You might want to make the code look like line 466-468, for consistency:

if (suppress_next_commit_)
  return;

+    is_composing_text_ = true;
 }
 
 void GtkIMContextWrapper::HandlePreeditChanged(const gchar* text,
                                                PangoAttrList* attrs,
                                                int cursor_position) {
-  suppress_next_commit_ = false;
+  // Ignore preedit related signals triggered by CancelComposition() method.
+  if (suppress_next_commit_)
+    return;
+
   // Don't set is_preedit_changed_ to false if there is no change, because
   // this handler might be called multiple times with the same data.
   is_preedit_changed_ = true;
   preedit_text_.clear();
   preedit_underlines_.clear();
   preedit_selection_start_ = 0;
   preedit_selection_end_ = 0;
 
   ExtractCompositionInfo(text, attrs, cursor_position, &preedit_text_,
                          &preedit_underlines_, &preedit_selection_start_,
@@ skipping 170 matching lines @@
     } while (pango_attr_iterator_next(iter));
     pango_attr_iterator_destroy(iter);
   }
 
   // Use a black thin underline by default.
   if (underlines->empty()) {
     underlines->push_back(
         WebKit::WebCompositionUnderline(0, length, SK_ColorBLACK, false));
   }
 }