Move SetCursorLocation bypass code.

ui/base/ime/input_method_ibus.cc

 // Copyright (c) 2012 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 "ui/base/ime/input_method_ibus.h"
 
 #include <X11/X.h>
 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
 #undef FocusIn
@@ skipping 10 matching lines @@
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "base/third_party/icu/icu_utf.h"
 #include "base/utf_string_conversions.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
 #include "chromeos/dbus/ibus/ibus_text.h"
 #include "ui/base/events/event_constants.h"
 #include "ui/base/events/event_utils.h"
-#include "ui/base/ime/ibus_client.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/keycodes/keyboard_code_conversion.h"
 #include "ui/base/keycodes/keyboard_code_conversion_x.h"
 #include "ui/base/keycodes/keyboard_codes.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
 const int kIBusReleaseMask = 1 << 30;
 const char kClientName[] = "chrome";
@@ skipping 24 matching lines @@
 // Converts X flags to ibus key state flags.
 uint32 IBusStateFromXFlags(unsigned int flags) {
   return (flags & (LockMask | ControlMask | ShiftMask | Mod1Mask |
                    Button1Mask | Button2Mask | Button3Mask));
 }
 
 chromeos::IBusInputContextClient* GetInputContextClient() {
   return chromeos::DBusThreadManager::Get()->GetIBusInputContextClient();
 }
 
+// Converts gfx::Rect to ibus::Rect.
+chromeos::ibus::Rect GfxRectToIBusRect(const gfx::Rect& rect) {
+  return chromeos::ibus::Rect(rect.x(), rect.y(), rect.width(), rect.height());
+}
+
 }  // namespace
 
 namespace ui {
 
 // InputMethodIBus implementation -----------------------------------------
 InputMethodIBus::InputMethodIBus(
     internal::InputMethodDelegate* delegate)
-    : ibus_client_(new internal::IBusClient),
-      input_context_state_(INPUT_CONTEXT_STOP),
+    : input_context_state_(INPUT_CONTEXT_STOP),
       create_input_context_fail_count_(0),
       context_focused_(false),
       composing_text_(false),
       composition_changed_(false),
       suppress_next_result_(false),
       current_keyevent_id_(0),
       weak_ptr_factory_(this) {
   SetDelegate(delegate);
 }
 
 InputMethodIBus::~InputMethodIBus() {
   AbandonAllPendingKeyEvents();
   if (IsContextReady())
     DestroyContext();
   if (GetInputContextClient())
     GetInputContextClient()->SetInputContextHandler(NULL);
 }
 
-void InputMethodIBus::set_ibus_client(
-    scoped_ptr<internal::IBusClient> new_client) {
-  ibus_client_.swap(new_client);
-}
-
-internal::IBusClient* InputMethodIBus::ibus_client() const {
-  return ibus_client_.get();
-}
-
 void InputMethodIBus::OnFocus() {
   InputMethodBase::OnFocus();
   UpdateContextFocusState();
 }
 
 void InputMethodIBus::OnBlur() {
   ConfirmCompositionText();
   InputMethodBase::OnBlur();
   UpdateContextFocusState();
 }
@@ skipping 38 matching lines @@
   IBusKeyEventFromNativeKeyEvent(
       native_event, &ibus_keyval, &ibus_keycode, &ibus_state);
 
   // If |context_| is not usable, then we can only dispatch the key event as is.
   // We also dispatch the key event directly if the current text input type is
   // TEXT_INPUT_TYPE_PASSWORD, to bypass the input method.
   // Note: We need to send the key event to ibus even if the |context_| is not
   // enabled, so that ibus can have a chance to enable the |context_|.
   if (!context_focused_ ||
       GetTextInputType() == TEXT_INPUT_TYPE_PASSWORD ||
-      ibus_client_->GetInputMethodType() ==
-      internal::IBusClient::INPUT_METHOD_XKB_LAYOUT) {
+      !GetInputContextClient() ||
+      GetInputContextClient()->IsXKBLayout()) {
     if (native_event->type == KeyPress)
       ProcessUnfilteredKeyPressEvent(native_event, ibus_keyval);
     else
       DispatchKeyEventPostIME(native_event);
     return;
   }
 
   pending_key_events_.insert(current_keyevent_id_);
 
   // Since |native_event| might be treated as XEvent whose size is bigger than
@@ skipping 38 matching lines @@
   // The current text input type should not be NONE if |context_| is focused.
   DCHECK(!IsTextInputTypeNone());
   const gfx::Rect rect = GetTextInputClient()->GetCaretBounds();
 
   gfx::Rect composition_head;
   if (!GetTextInputClient()->GetCompositionCharacterBounds(0,
                                                            &composition_head)) {
     composition_head = rect;
   }
 
-  // This function runs asynchronously.
-  ibus_client_->SetCursorLocation(rect, composition_head);
+  GetInputContextClient()->SetCursorLocation(
+      GfxRectToIBusRect(rect),
+      GfxRectToIBusRect(composition_head));
 
   ui::Range text_range;
   ui::Range selection_range;
   string16 surrounding_text;
   if (!GetTextInputClient()->GetTextRange(&text_range) ||
       !GetTextInputClient()->GetTextFromRange(text_range, &surrounding_text) ||
       !GetTextInputClient()->GetSelectionRange(&selection_range)) {
     previous_surrounding_text_.clear();
     previous_selection_range_ = ui::Range::InvalidRange();
     return;
@@ skipping 672 matching lines @@
   }
 
   // Use a black thin underline by default.
   if (out_composition->underlines.empty()) {
     out_composition->underlines.push_back(CompositionUnderline(
         0, length, SK_ColorBLACK, false /* thick */));
   }
 }
 
 }  // namespace ui