Index: third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
diff --git a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
index dd414101083c219e1f8b9c1e9b53ab62966701de..2f7efda1693b76956f6b6a2cbd7c381d575ac600 100644 |
--- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
+++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
@@ -234,14 +234,11 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDesc |
return adoptRef(m_fontManager->matchFamilyStyle(name.data(), fontStyle(fontDescription))); |
#endif |
- // FIXME: Use m_fontManager, SkFontStyle and matchFamilyStyle instead of |
- // CreateFromName on all platforms. |
- int style = SkTypeface::kNormal; |
- if (fontDescription.weight() >= FontWeight600) |
- style |= SkTypeface::kBold; |
- if (fontDescription.style()) |
- style |= SkTypeface::kItalic; |
- return adoptRef(SkTypeface::CreateFromName(name.data(), static_cast<SkTypeface::Style>(style))); |
+ // FIXME: Use m_fontManager, matchFamilyStyle instead of |
+ // legacyCreateTypeface on all platforms. |
+ RefPtr<SkFontMgr> fm = adoptRef(SkFontMgr::RefDefault()); |
+ return adoptRef(fm->legacyCreateTypeface(name.data(), |
+ fontStyle(fontDescription))); |
} |
#if !OS(WIN) |