Move SetCursorLocation bypass code.

chrome/browser/chromeos/input_method/candidate_window_controller_impl.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 "chrome/browser/chromeos/input_method/candidate_window_controller_impl.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 12 matching lines @@
 #endif  // USE_ASH
 
 namespace chromeos {
 namespace input_method {
 
 namespace {
 // The milliseconds of the delay to show the infolist window.
 const int kInfolistShowDelayMilliSeconds = 500;
 // The milliseconds of the delay to hide the infolist window.
 const int kInfolistHideDelayMilliSeconds = 500;
+
+// Converts from ibus::Rect to gfx::Rect.
+gfx::Rect IBusRectToGfxRect(const ibus::Rect& rect) {
+  return gfx::Rect(rect.x, rect.y, rect.width, rect.height);
+}
 }  // namespace
 
 bool CandidateWindowControllerImpl::Init(IBusController* controller) {
   if (controller)
     controller->AddObserver(this);
   // Create the candidate window view.
   CreateView();
 
   // The observer should be added before Connect() so we can capture the
   // initial connection change.
@@ skipping 74 matching lines @@
 void CandidateWindowControllerImpl::OnHideLookupTable() {
   candidate_window_->HideLookupTable();
   infolist_window_->Hide();
 }
 
 void CandidateWindowControllerImpl::OnHidePreeditText() {
   candidate_window_->HidePreeditText();
 }
 
 void CandidateWindowControllerImpl::OnSetCursorLocation(
-    const gfx::Rect& cursor_location,
-    const gfx::Rect& composition_head) {
+    const ibus::Rect& cursor_location,
+    const ibus::Rect& composition_head) {
   // A workaround for http://crosbug.com/6460. We should ignore very short Y
   // move to prevent the window from shaking up and down.
   const int kKeepPositionThreshold = 2;  // px
   const gfx::Rect& last_location =
       candidate_window_->cursor_location();
-  const int delta_y = abs(last_location.y() - cursor_location.y());
-  if ((last_location.x() == cursor_location.x()) &&
+  const int delta_y = abs(last_location.y() - cursor_location.y);
+  if ((last_location.x() == cursor_location.x) &&
       (delta_y <= kKeepPositionThreshold)) {
     DVLOG(1) << "Ignored set_cursor_location signal to prevent window shake";
     return;
   }
 
   // Remember the cursor location.
-  candidate_window_->set_cursor_location(cursor_location);
-  candidate_window_->set_composition_head_location(composition_head);
+  candidate_window_->set_cursor_location(IBusRectToGfxRect(cursor_location));
+  candidate_window_->set_composition_head_location(
+      IBusRectToGfxRect(composition_head));
   // Move the window per the cursor location.
   candidate_window_->ResizeAndMoveParentFrame();
   UpdateInfolistBounds();
 }
 
 void CandidateWindowControllerImpl::OnUpdateAuxiliaryText(
     const std::string& utf8_text,
     bool visible) {
   // If it's not visible, hide the auxiliary text and return.
   if (!visible) {
@@ skipping 192 matching lines @@
 
   if (candidate_window_rect.y() + infolist_window_size.height() >
       screen_rect.bottom())
     result.set_y(screen_rect.bottom() - infolist_window_size.height());
 
   return result;
 }
 
 }  // namespace input_method
 }  // namespace chromeos