| Index: src/fonts/SkFontMgr_fontconfig.cpp
|
| diff --git a/src/fonts/SkFontMgr_fontconfig.cpp b/src/fonts/SkFontMgr_fontconfig.cpp
|
| index 60ad862a507de828d17c5ba0e9d98fd78515ad48..fedd3dc53360fc3646ec5bdd23092ab800b06fbe 100644
|
| --- a/src/fonts/SkFontMgr_fontconfig.cpp
|
| +++ b/src/fonts/SkFontMgr_fontconfig.cpp
|
| @@ -318,12 +318,7 @@ protected:
|
| return stream.get() ? this->createFromStream(stream.release(), ttcIndex) : nullptr;
|
| }
|
|
|
| -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
|
| - SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const override {
|
| - SkTypeface::Style style = static_cast<SkTypeface::Style>(styleBits);
|
| -#else
|
| SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle style) const override {
|
| -#endif
|
| FCLocker lock;
|
| return FontConfigTypeface::LegacyCreateTypeface(familyName, style);
|
| }
|
|
|