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 5ad1346766c4fe1af86bfd1490e90f6a37ac2342..429376a9e2913d417161cef7604e47928338f160 100644 |
--- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
+++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
@@ -197,14 +197,11 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDesc |
return adoptRef(m_fontManager->matchFamilyStyle(name.data(), fontDescription.skiaFontStyle())); |
#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; |
bungeman-skia
2016/04/25 19:18:02
This or'ed in kItalic if the fontDescription was e
Tom (Use chromium acct)
2016/04/26 00:36:15
Done.
|
- 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(), |
+ fontDescription.skiaFontStyle())); |
} |
#if !OS(WIN) |
@@ -219,7 +216,7 @@ PassOwnPtr<FontPlatformData> FontCache::createFontPlatformData(const FontDescrip |
return adoptPtr(new FontPlatformData(tf, |
name.data(), |
fontSize, |
- (fontDescription.weight() >= FontWeight600 && !tf->isBold()) || fontDescription.isSyntheticBold(), |
+ (fontDescription.weight() > 200 + tf->fontStyle().weight()) || fontDescription.isSyntheticBold(), |
((fontDescription.style() == FontStyleItalic || fontDescription.style() == FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(), |
fontDescription.orientation(), |
fontDescription.useSubpixelPositioning())); |