Revert of RenderTextMac: Cache the SkTypeface on the TextRun

ui/gfx/render_text_mac.mm

 // 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/gfx/render_text_mac.h"
 
 #import <AppKit/AppKit.h>
 #include <ApplicationServices/ApplicationServices.h>
 #include <CoreText/CoreText.h>
 
@@ skipping 46 matching lines @@
   base::ScopedCFTypeRef<CTFontDescriptorRef> desc(
       CTFontDescriptorCreateWithAttributes(attributes));
   return base::ScopedCFTypeRef<CTFontRef>(
       CTFontCreateWithFontDescriptor(desc, 0.0, nullptr));
 }
 
 }  // namespace
 
 namespace gfx {
 
+namespace internal {
+
+skia::RefPtr<SkTypeface> CreateSkiaTypeface(const gfx::Font& font, int style) {
+  gfx::Font font_with_style = font.Derive(0, style);
+  if (!font_with_style.GetNativeFont())
+    return nullptr;
+  return skia::AdoptRef(SkCreateTypefaceFromCTFont(
+      static_cast<CTFontRef>(font_with_style.GetNativeFont())));
+}
+
+}  // namespace internal
+
 RenderTextMac::RenderTextMac() : common_baseline_(0), runs_valid_(false) {}
 
 RenderTextMac::~RenderTextMac() {}
 
 std::unique_ptr<RenderText> RenderTextMac::CreateInstanceOfSameType() const {
   return base::WrapUnique(new RenderTextMac);
 }
 
 bool RenderTextMac::MultilineSupported() const {
   return false;
@@ skipping 116 matching lines @@
   ApplyFadeEffects(renderer);
   ApplyTextShadows(renderer);
 
   for (size_t i = 0; i < runs_.size(); ++i) {
     const TextRun& run = runs_[i];
     renderer->SetForegroundColor(run.foreground);
 
     CTFontRef ct_font = static_cast<CTFontRef>(run.font.GetNativeFont());
     renderer->SetTextSize(CTFontGetSize(ct_font));
 
-    // The painter adds its own ref. So don't |release()| it from the ref ptr in
-    // TextRun.
-    renderer->SetTypeface(run.typeface.get());
+    int font_style = Font::NORMAL;
+    CTFontSymbolicTraits traits = CTFontGetSymbolicTraits(ct_font);
+    if (traits & kCTFontBoldTrait)
+      font_style |= Font::BOLD;
+    if (traits & kCTFontItalicTrait)
+      font_style |= Font::ITALIC;
+    renderer->SetFontWithStyle(run.font, font_style);
 
     renderer->DrawPosText(&run.glyph_positions[0], &run.glyphs[0],
                           run.glyphs.size());
     renderer->DrawDecorations(run.origin.x(), run.origin.y(), run.width,
                               run.underline, run.strike, run.diagonal_strike);
   }
 
   renderer->EndDiagonalStrike();
 }
 
@@ skipping 178 matching lines @@
       point->set(x + SkDoubleToScalar(positions_ptr[glyph].x),
                  y + SkDoubleToScalar(positions_ptr[glyph].y));
     }
 
     // TODO(asvitkine): Style boundaries are not necessarily per-run. Handle
     //                  this better. Also, support strike and diagonal_strike.
     CFDictionaryRef attributes = CTRunGetAttributes(ct_run);
     CTFontRef ct_font = base::mac::GetValueFromDictionary<CTFontRef>(
         attributes, kCTFontAttributeName);
     run->font = Font(static_cast<NSFont*>(ct_font));
-    run->typeface.reset(SkCreateTypefaceFromCTFont(ct_font));
 
     const CGColorRef foreground = base::mac::GetValueFromDictionary<CGColorRef>(
         attributes, kCTForegroundColorAttributeName);
     if (foreground)
       run->foreground = skia::CGColorRefToSkColor(foreground);
 
     const CFNumberRef underline =
         base::mac::GetValueFromDictionary<CFNumberRef>(
             attributes, kCTUnderlineStyleAttributeName);
     CTUnderlineStyle value = kCTUnderlineStyleNone;
     if (underline && CFNumberGetValue(underline, kCFNumberSInt32Type, &value))
       run->underline = (value == kCTUnderlineStyleSingle);
 
     run_origin.offset(run_width, 0);
   }
   runs_valid_ = true;
 }
 
 void RenderTextMac::InvalidateStyle() {
   line_.reset();
   attributes_.reset();
   runs_.clear();
   runs_valid_ = false;
 }
 
 }  // namespace gfx