| Index: src/ports/SkFontMgr_custom.cpp
 | 
| diff --git a/src/ports/SkFontMgr_custom.cpp b/src/ports/SkFontMgr_custom.cpp
 | 
| index 6749ced350fd10d311e71b3c29b71c31207a2aea..20d6f78f7e801ed1800c426f97cd708d90f631c9 100644
 | 
| --- a/src/ports/SkFontMgr_custom.cpp
 | 
| +++ b/src/ports/SkFontMgr_custom.cpp
 | 
| @@ -308,12 +308,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 {
 | 
| -        SkFontStyle style = SkFontStyle::FromOldStyle(styleBits);
 | 
| -#else
 | 
|      SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle style) const override {
 | 
| -#endif
 | 
|          SkTypeface* tf = nullptr;
 | 
|  
 | 
|          if (familyName) {
 | 
| 
 |