Move some common ime code to ui/base/

chrome/browser/renderer_host/gtk_im_context_wrapper.h

 // 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.
 
 #ifndef CHROME_BROWSER_RENDERER_HOST_GTK_IM_CONTEXT_WRAPPER_H_
 #define CHROME_BROWSER_RENDERER_HOST_GTK_IM_CONTEXT_WRAPPER_H_
 #pragma once
 
 #include <gdk/gdk.h>
 #include <pango/pango-attributes.h>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/gtest_prod_util.h"
 #include "base/string16.h"
-#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebTextInputType.h"
+#include "ui/base/ime/composition_text.h"
 
 namespace gfx {
 class Rect;
 }
 
 #if !defined(TOOLKIT_VIEWS)
 class MenuGtk;
 #endif
 class RenderWidgetHostViewGtk;
 struct NativeWebKeyboardEvent;
@@ skipping 28 matching lines @@
   // Not defined for views because the views context menu doesn't
   // implement input methods yet.
   void AppendInputMethodsContextMenu(MenuGtk* menu);
 #endif
 
   void CancelComposition();
 
   void ConfirmComposition();
 
  private:
-  // For unit tests.
-  class GtkIMContextWrapperTest;
-  FRIEND_TEST_ALL_PREFIXES(GtkIMContextWrapperTest, ExtractCompositionInfo);
-
   // Check if a text needs commit by forwarding a char event instead of
   // by confirming as a composition text.
   bool NeedCommitByForwardingCharEvent() const;
 
   // Check if the input method returned any result, eg. preedit and commit text.
   bool HasInputMethodResult() const;
 
   void ProcessFilteredKeyPressEvent(NativeWebKeyboardEvent* wke);
   void ProcessUnfilteredKeyPressEvent(NativeWebKeyboardEvent* wke);
 
@@ skipping 36 matching lines @@
                                         GtkIMContextWrapper* self);
   static void HandlePreeditEndThunk(GtkIMContext* context,
                                     GtkIMContextWrapper* self);
 
   // Signal handlers connecting to |host_view_|'s native view widget.
   static void HandleHostViewRealizeThunk(GtkWidget* widget,
                                          GtkIMContextWrapper* self);
   static void HandleHostViewUnrealizeThunk(GtkWidget* widget,
                                            GtkIMContextWrapper* self);
 
-  // Extracts composition underlines, selection range and utf-16 text from given
-  // utf-8 text, pango attributes and cursor position.
-  static void ExtractCompositionInfo(
-      const gchar* utf8_text,
-      PangoAttrList* attrs,
-      int cursor_position,
-      string16* utf16_text,
-      std::vector<WebKit::WebCompositionUnderline>* underlines,
-      int* selection_start,
-      int* selection_end);
-
   // The parent object.
   RenderWidgetHostViewGtk* host_view_;
 
   // The GtkIMContext object.
   // In terms of the DOM event specification Appendix A
   //   <http://www.w3.org/TR/DOM-Level-3-Events/keyset.html>,
   // GTK uses a GtkIMContext object for the following two purposes:
   //  1. Composing Latin characters (A.1.2), and;
   //  2. Composing CJK characters with an IME (A.1.3).
   // Many JavaScript pages assume composed Latin characters are dispatched to
@@ skipping 31 matching lines @@
 
   // Whether or not the IME is enabled.
   bool is_enabled_;
 
   // Whether or not it's currently running inside key event handler.
   // If it's true, then preedit-changed and commit handler will backup the
   // preedit or commit text instead of sending them down to webkit.
   // key event handler will send them later.
   bool is_in_key_event_handler_;
 
-  // Stores a copy of the most recent preedit text retrieved from context_.
-  string16 preedit_text_;
+  // The most recent composition text information retrieved from context_;
+  ui::CompositionText composition_;
 
-  // Stores the selection range in the stored preedit text.
-  int preedit_selection_start_;
-  int preedit_selection_end_;
-
-  // Stores composition underlines computed from the pango attributes of the
-  // most recent preedit text.
-  std::vector<WebKit::WebCompositionUnderline> preedit_underlines_;
-
-  // Whether or not the preedit has been changed since last key event.
-  bool is_preedit_changed_;
+  // Whether or not the composition has been changed since last key event.
+  bool is_composition_changed_;
 
   // Stores a copy of the most recent commit text received by commit signal
   // handler.
   string16 commit_text_;
 
   // If it's true then the next "commit" signal will be suppressed.
   // It's only used to workaround http://crbug.com/50485.
   // TODO(suzhe): Remove it after input methods get fixed.
   bool suppress_next_commit_;
 
   // Information of the last key event, for working around
   // http://crosbug.com/6582
   int last_key_code_;
   bool last_key_was_up_;
   bool last_key_filtered_no_result_;
 
   DISALLOW_COPY_AND_ASSIGN(GtkIMContextWrapper);
 };
 
 #endif  // CHROME_BROWSER_RENDERER_HOST_GTK_IM_CONTEXT_WRAPPER_H_