Index: src/ports/SkFontMgr_win_dw.cpp |
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp |
index 788bb5edd3f8ae962cb63072e59580ab71bb0141..a03fcf8d426e0690e99f566f8c07fba9a4d661a5 100644 |
--- a/src/ports/SkFontMgr_win_dw.cpp |
+++ b/src/ports/SkFontMgr_win_dw.cpp |
@@ -294,11 +294,7 @@ protected: |
SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const override; |
SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override; |
SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override; |
-#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE |
- SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const override; |
-#else |
SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const override; |
-#endif |
private: |
HRESULT getByFamilyName(const WCHAR familyName[], IDWriteFontFamily** fontFamily) const; |
@@ -953,14 +949,8 @@ HRESULT SkFontMgr_DirectWrite::getDefaultFontFamily(IDWriteFontFamily** fontFami |
return S_OK; |
} |
-#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE |
-SkTypeface* SkFontMgr_DirectWrite::onLegacyCreateTypeface(const char familyName[], |
- unsigned styleBits) const { |
- SkFontStyle style = SkFontStyle::FromOldStyle(styleBits); |
-#else |
SkTypeface* SkFontMgr_DirectWrite::onLegacyCreateTypeface(const char familyName[], |
SkFontStyle style) const { |
-#endif |
SkTScopedComPtr<IDWriteFontFamily> fontFamily; |
if (familyName) { |
SkSMallocWCHAR wideFamilyName; |