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..8614ba0486755cb15946157a68cd10bf015c707d 100644 |
--- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
+++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
@@ -236,12 +236,7 @@ PassRefPtr<SkTypeface> FontCache::createTypeface(const FontDescription& fontDesc |
// FIXME: Use m_fontManager, SkFontStyle and matchFamilyStyle instead of |
eae
2016/04/22 02:05:46
Please change this to remove the reference to SkFo
Tom (Use chromium acct)
2016/04/22 18:51:53
Done.
|
// 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))); |
+ return adoptRef(SkTypeface::CreateFromName(name.data(), fontStyle(fontDescription))); |
bungeman-skia
2016/04/22 18:15:36
Why not just
// FIXME: Use m_fontManager, matchFa
Tom (Use chromium acct)
2016/04/22 18:51:53
Done.
|
} |
#if !OS(WIN) |