Revert of RenderTextMac: Cache the SkTypeface on the TextRun

ui/gfx/render_text.h

Index: ui/gfx/render_text.h
diff --git a/ui/gfx/render_text.h b/ui/gfx/render_text.h
index d1687e2cf85ce4c29b9c329e04f0d341b43bae1f..6b0c489cf502a8ac6e8cea80dd83b320f8baeb66 100644
--- a/ui/gfx/render_text.h
+++ b/ui/gfx/render_text.h
@@ -62,6 +62,7 @@
                            bool subpixel_rendering_suppressed);
   void SetTypeface(SkTypeface* typeface);
   void SetTextSize(SkScalar size);
+  void SetFontWithStyle(const Font& font, int font_style);
   void SetForegroundColor(SkColor foreground);
   void SetShader(sk_sp<SkShader> shader);
   // Sets underline metrics to use if the text will be drawn with an underline.
@@ -184,6 +185,10 @@
   // Maximum baseline of all segments on this line.
   int baseline;
 };
+
+// Creates an SkTypeface from a font and a |gfx::Font::FontStyle|.
+// May return NULL.
+skia::RefPtr<SkTypeface> CreateSkiaTypeface(const gfx::Font& font, int style);
 
 // Applies the given FontRenderParams to a Skia |paint|.
 void ApplyRenderParams(const FontRenderParams& params,