Revert of RenderTextMac: Cache the SkTypeface on the TextRun

ui/gfx/render_text_harfbuzz.cc

Index: ui/gfx/render_text_harfbuzz.cc
diff --git a/ui/gfx/render_text_harfbuzz.cc b/ui/gfx/render_text_harfbuzz.cc
index 9fbcbd178785df64506b6277438c5bdfd400c557..731cc6f24051c2a15b6b6cc31888a03fe38387fa 100644
--- a/ui/gfx/render_text_harfbuzz.cc
+++ b/ui/gfx/render_text_harfbuzz.cc
@@ -562,14 +562,6 @@
            0;
   }
 };
-
-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)));
-}
 
 }  // namespace
 
@@ -1465,7 +1457,8 @@
                                           const gfx::Font& font,
                                           const FontRenderParams& params,
                                           internal::TextRunHarfBuzz* run) {
-  sk_sp<SkTypeface> skia_face(CreateSkiaTypeface(font, run->font_style));
+  skia::RefPtr<SkTypeface> skia_face =
+      internal::CreateSkiaTypeface(font, run->font_style);
   if (skia_face == NULL)
     return false;
   run->skia_face = skia_face;