| Index: src/ports/SkFontMgr_android.cpp
|
| diff --git a/src/ports/SkFontMgr_android.cpp b/src/ports/SkFontMgr_android.cpp
|
| index 741d6cc173f4c2e3c16deb1bf737eea82b9ba3cb..ed5a4d53a78a016bde81ab47ec8009ac66a5f4d2 100644
|
| --- a/src/ports/SkFontMgr_android.cpp
|
| +++ b/src/ports/SkFontMgr_android.cpp
|
| @@ -487,12 +487,7 @@ protected:
|
| return new SkTypeface_AndroidStream(data, style, isFixedPitch, name);
|
| }
|
|
|
| -#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
|
| if (familyName) {
|
| // On Android, we must return nullptr when we can't find the requested
|
| // named typeface so that the system/app can provide their own recovery
|
|
|