Fix cursor positioning regression from r201136. GetCursorPos() shouldn't assume

ui/gfx/render_text.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/gfx/render_text.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 646 matching lines @@
 Rect RenderText::GetCursorBounds(const SelectionModel& caret,
                                  bool insert_mode) {
   EnsureLayout();
 
   size_t caret_pos = caret.caret_pos();
   DCHECK(IsCursorablePosition(caret_pos));
   // In overtype mode, ignore the affinity and always indicate that we will
   // overtype the next character.
   LogicalCursorDirection caret_affinity =
       insert_mode ? caret.caret_affinity() : CURSOR_FORWARD;
-  int x = 0, width = 1, height = 0;
+  int x = 0, width = 1;
+  Size size = GetStringSize();
   if (caret_pos == (caret_affinity == CURSOR_BACKWARD ? 0 : text().length())) {
     // The caret is attached to the boundary. Always return a 1-dip width caret,
     // since there is nothing to overtype.
-    Size size = GetStringSize();
     if ((GetTextDirection() == base::i18n::RIGHT_TO_LEFT) == (caret_pos == 0))
       x = size.width();
-    height = size.height();
   } else {
     size_t grapheme_start = (caret_affinity == CURSOR_FORWARD) ?
         caret_pos : IndexOfAdjacentGrapheme(caret_pos, CURSOR_BACKWARD);
-    ui::Range xspan;
-    GetGlyphBounds(grapheme_start, &xspan, &height);
+    ui::Range xspan(GetGlyphBounds(grapheme_start));
     if (insert_mode) {
       x = (caret_affinity == CURSOR_BACKWARD) ? xspan.end() : xspan.start();
     } else {  // overtype mode
       x = xspan.GetMin();
       width = xspan.length();
     }
   }
-  height = std::min(height, display_rect().height());
-  int y = (display_rect().height() - height) / 2;
-  return Rect(ToViewPoint(Point(x, y)), Size(width, height));
+  return Rect(ToViewPoint(Point(x, 0)), Size(width, size.height()));
 }
 
 const Rect& RenderText::GetUpdatedCursorBounds() {
   UpdateCachedBoundsAndOffset();
   return cursor_bounds_;
 }
 
 size_t RenderText::IndexOfAdjacentGrapheme(size_t index,
     LogicalCursorDirection direction) {
   if (index > text().length())
@@ skipping 278 matching lines @@
 void RenderText::DrawSelection(Canvas* canvas) {
   const SkColor color = focused() ?
       selection_background_focused_color_ :
       selection_background_unfocused_color_;
   const std::vector<Rect> sel = GetSubstringBounds(selection());
   for (std::vector<Rect>::const_iterator i = sel.begin(); i < sel.end(); ++i)
     canvas->FillRect(*i, color);
 }
 
 }  // namespace gfx