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

ui/views/ime/input_method_base.cc

Index: ui/views/ime/input_method_base.cc
===================================================================
--- ui/views/ime/input_method_base.cc	(revision 199681)
+++ ui/views/ime/input_method_base.cc	(working copy)
@@ -86,7 +86,11 @@
   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_)