diff options
| author |  bungeman <bungeman@google.com> | 2016-04-13 05:23:35 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-13 05:23:35 -0700 |
| commit | ed2edabd07086bbf60df17ca0bf52d8ba49f2273 (patch) | |
| tree | d14257caf9d2775bcff4132eb8195d68a7d07576 /src/ports/SkFontMgr_win_dw.cpp | |
| parent | dada4dd9cf03e42369ca5b38086dba77f01a68e6 (diff) | |
Remove SK_VERY_LEGACY_CREATE_TYPEFACE.
The flag and code it guards are no longer used.
TBR=reed
This just removes dead code.
Review URL: https://codereview.chromium.org/1882803002
Diffstat (limited to 'src/ports/SkFontMgr_win_dw.cpp')
| -rw-r--r-- | src/ports/SkFontMgr_win_dw.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp index 788bb5edd3..a03fcf8d42 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; |