| Index: src/fonts/SkFontMgr_indirect.cpp
 | 
| diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp
 | 
| index 4d226da855f9296100ffee0ef6edc549c98ab5f1..d3fae91808af8d9f6d1019c2ab3a6ba4017ac4de 100644
 | 
| --- a/src/fonts/SkFontMgr_indirect.cpp
 | 
| +++ b/src/fonts/SkFontMgr_indirect.cpp
 | 
| @@ -184,14 +184,8 @@ SkTypeface* SkFontMgr_Indirect::onCreateFromData(SkData* data, int ttcIndex) con
 | 
|      return fImpl->createFromData(data, ttcIndex);
 | 
|  }
 | 
|  
 | 
| -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
 | 
| -SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[],
 | 
| -                                                       unsigned styleBits) const {
 | 
| -    SkFontStyle style = SkFontStyle::FromOldStyle(styleBits);
 | 
| -#else
 | 
|  SkTypeface* SkFontMgr_Indirect::onLegacyCreateTypeface(const char familyName[],
 | 
|                                                         SkFontStyle style) const {
 | 
| -#endif
 | 
|      SkAutoTUnref<SkTypeface> face(this->matchFamilyStyle(familyName, style));
 | 
|  
 | 
|      if (nullptr == face.get()) {
 | 
| 
 |