Use CTFontCreateForString for RenderTextHarfbuzz on Mac

ui/views/controls/label_unittest.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/controls/label.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/i18n/rtl.h"
@@ skipping 211 matching lines @@
     label()->OnPaint(&canvas);
   }
 
   gfx::Point GetCursorPoint(int index) {
     SimulatePaint();
     gfx::RenderText* render_text =
         label()->GetRenderTextForSelectionController();
     const std::vector<gfx::Rect> bounds =
         render_text->GetSubstringBoundsForTesting(gfx::Range(index, index + 1));
     DCHECK_EQ(1u, bounds.size());
+    const int mid_y = bounds[0].y() + bounds[0].height() / 2;
 
+    // For single-line text, use the glyph bounds since it's a better
+    // representation of the midpoint between glyphs when considering selection.
+    // TODO(tapted): When GetGlyphBounds() supports returning a vertical range
+    // as well as a horizontal range, just use that here.
+    if (!render_text->multiline())
+      return gfx::Point(render_text->GetGlyphBounds(index).start(), mid_y);
+
+    // Otherwise, GetGlyphBounds() will give incorrect results. Multiline
+    // editing is not supported (http://crbug.com/248597) so there hasn't been
+    // a need to draw a cursor. Instead, derive a point from the selection
+    // bounds, which always rounds up to an integer after the end of a glyph.
+    // This rounding differs to the glyph bounds, which rounds to nearest
+    // integer. See http://crbug.com/735346.
     const bool rtl =
         render_text->GetDisplayTextDirection() == base::i18n::RIGHT_TO_LEFT;
     // Return Point corresponding to the leading edge of the character.
-    return gfx::Point(rtl ? bounds[0].right() - 1 : bounds[0].x() + 1,
-                      bounds[0].y() + bounds[0].height() / 2);
+    return gfx::Point(rtl ? bounds[0].right() - 1 : bounds[0].x() + 1, mid_y);
   }
 
   size_t GetLineCount() {
     SimulatePaint();
     return label()->GetRenderTextForSelectionController()->GetNumLines();
   }
 
   base::string16 GetSelectedText() { return label()->GetSelectedText(); }
 
   ui::test::EventGenerator* event_generator() { return event_generator_.get(); }
@@ skipping 1060 matching lines @@
   EXPECT_FALSE(IsMenuCommandEnabled(IDS_APP_SELECT_ALL));
 }
 
 INSTANTIATE_TEST_CASE_P(,
                         MDLabelTest,
                         ::testing::Values(SecondaryUiMode::MD,
                                           SecondaryUiMode::NON_MD),
                         &SecondaryUiModeToString);
 
 }  // namespace views