Merge 199665 "Return caret bounds in local coordinates from GetC..."

ui/views/ime/input_method_base.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/views/ime/input_method_base.h"
 
 #include "base/logging.h"
 #include "ui/base/events/event.h"
 #include "ui/base/ime/text_input_client.h"
 #include "ui/views/view.h"
@@ skipping 68 matching lines @@
   if (delegate_)
     delegate_->DispatchKeyEventPostIME(key);
 }
 
 bool InputMethodBase::GetCaretBoundsInWidget(gfx::Rect* rect) const {
   DCHECK(rect);
   ui::TextInputClient* client = GetTextInputClient();
   if (!client || client->GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
     return false;
 
-  *rect = GetFocusedView()->ConvertRectToWidget(client->GetCaretBounds());
+  gfx::Rect caret_bounds = client->GetCaretBounds();
+  gfx::Point caret_origin = caret_bounds.origin();
+  View::ConvertPointFromScreen(GetFocusedView(), &caret_origin);
+  caret_bounds.set_origin(caret_origin);
+  *rect = GetFocusedView()->ConvertRectToWidget(caret_bounds);
 
   // Convert coordinates if the focused view is inside a child Widget.
   if (GetFocusedView()->GetWidget() != widget_)
     return Widget::ConvertRect(GetFocusedView()->GetWidget(), widget_, rect);
   return true;
 }
 
 }  // namespace views