| Index: src/ports/SkFontMgr_fontconfig.cpp
|
| diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
|
| index c8b055f779678d5737ea12f8779ff31a4de01eca..393265c54260a30a203ff953eaff8c380515621b 100644
|
| --- a/src/ports/SkFontMgr_fontconfig.cpp
|
| +++ b/src/ports/SkFontMgr_fontconfig.cpp
|
| @@ -874,12 +874,7 @@ protected:
|
| return new SkTypeface_stream(fontData, style, isFixedWidth);
|
| }
|
|
|
| -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
|
| - SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const override {
|
| - SkFontStyle style = SkFontStyle::FromOldStyle(styleBits);
|
| -#else
|
| SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle style) const override {
|
| -#endif
|
| SkAutoTUnref<SkTypeface> typeface(this->matchFamilyStyle(familyName, style));
|
| if (typeface.get()) {
|
| return typeface.release();
|
|
|