RenderTextMac: Cache the SkTypeface on the TextRun [reland]

ui/gfx/render_text_harfbuzz.cc

 // Copyright 2014 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_harfbuzz.h"
 
 #include <limits>
 #include <set>
 
 #include "base/i18n/bidi_line_iterator.h"
@@ skipping 549 matching lines @@
   bool operator() (const Font& a, const Font& b) const {
     return base::CompareCaseInsensitiveASCII(a.GetFontName(), b.GetFontName()) <
            0;
   }
 };
 
 }  // namespace
 
 namespace internal {
 
+#if !defined(OS_MACOSX)
+sk_sp<SkTypeface> CreateSkiaTypeface(const gfx::Font& font, int style) {
+  int skia_style = SkTypeface::kNormal;
+  skia_style |= (style & Font::BOLD) ? SkTypeface::kBold : 0;
+  skia_style |= (style & Font::ITALIC) ? SkTypeface::kItalic : 0;
+  return sk_sp<SkTypeface>(SkTypeface::CreateFromName(
+      font.GetFontName().c_str(), static_cast<SkTypeface::Style>(skia_style)));
+}
+#endif
+
 TextRunHarfBuzz::TextRunHarfBuzz()
     : width(0.0f),
       preceding_run_widths(0.0f),
       is_rtl(false),
       level(0),
       script(USCRIPT_INVALID_CODE),
       glyph_count(static_cast<size_t>(-1)),
       font_size(0),
       baseline_offset(0),
       baseline_type(0),
@@ skipping 870 matching lines @@
     return;
 
   run->glyph_count = 0;
   run->width = 0.0f;
 }
 
 bool RenderTextHarfBuzz::ShapeRunWithFont(const base::string16& text,
                                           const gfx::Font& font,
                                           const FontRenderParams& params,
                                           internal::TextRunHarfBuzz* run) {
-  skia::RefPtr<SkTypeface> skia_face =
-      internal::CreateSkiaTypeface(font, run->font_style);
-  if (skia_face == NULL)
+  sk_sp<SkTypeface> skia_face(
+      internal::CreateSkiaTypeface(font, run->font_style));
+  if (!skia_face)
     return false;
+
   run->skia_face = skia_face;
   run->font = font;
   run->render_params = params;
 
   hb_font_t* harfbuzz_font = CreateHarfBuzzFont(
       run->skia_face.get(), SkIntToScalar(run->font_size), run->render_params,
       subpixel_rendering_suppressed());
 
   // Create a HarfBuzz buffer and add the string to be shaped. The HarfBuzz
   // buffer holds our text, run information to be used by the shaping engine,
@@ skipping 95 matching lines @@
   DCHECK(!update_layout_run_list_);
   DCHECK(!update_display_run_list_);
   return text_elided() ? display_run_list_.get() : &layout_run_list_;
 }
 
 const internal::TextRunList* RenderTextHarfBuzz::GetRunList() const {
   return const_cast<RenderTextHarfBuzz*>(this)->GetRunList();
 }
 
 }  // namespace gfx