Revert 111288 - Possibly broke media_unittests on Mac

ui/gfx/render_text_linux.cc

 // Copyright (c) 2011 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_linux.h"
 
 #include <pango/pangocairo.h>
 
 #include <algorithm>
 
@@ skipping 71 matching lines @@
   Point offset(ToViewPoint(Point()));
   // Vertically centered.
   int text_y = offset.y() + ((bounds.height() - text_height) / 2);
   // TODO(xji): need to use SkCanvas->drawPosText() for gpu acceleration.
   cairo_move_to(cr, offset.x(), text_y);
   pango_cairo_show_layout(cr, layout);
 
   cairo_restore(cr);
 
   // Paint cursor.
+  bounds = GetUpdatedCursorBounds();
   if (cursor_visible() && focused())
-    canvas->DrawRect(GetUpdatedCursorBounds(), kCursorColor);
+      canvas->DrawRectInt(kCursorColor,
+                          bounds.x(),
+                          bounds.y(),
+                          bounds.width(),
+                          bounds.height());
 }
 
 SelectionModel RenderTextLinux::FindCursorPosition(const Point& point) {
   PangoLayout* layout = EnsureLayout();
 
   if (text().empty())
     return SelectionModel(0, 0, SelectionModel::LEADING);
 
   Point p(ToTextPoint(point));
 
@@ skipping 542 matching lines @@
 size_t RenderTextLinux::Utf8IndexToUtf16Index(size_t index) const {
   int32_t utf16_index = 0;
   UErrorCode ec = U_ZERO_ERROR;
   u_strFromUTF8(NULL, 0, &utf16_index, layout_text_, index, &ec);
   DCHECK(ec == U_BUFFER_OVERFLOW_ERROR ||
          ec == U_STRING_NOT_TERMINATED_WARNING);
   return utf16_index;
 }
 
 }  // namespace gfx