| Index: include/ports/SkFontConfigInterface.h
 | 
| diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h
 | 
| index 464251bc2dce5a7b2eae353f2898faa6db310853..3c68a242e54f0a270fbae89d4b715dec59086b7b 100644
 | 
| --- a/include/ports/SkFontConfigInterface.h
 | 
| +++ b/include/ports/SkFontConfigInterface.h
 | 
| @@ -80,19 +80,11 @@ public:
 | 
|       *
 | 
|       *  If a match is not found, return false, and ignore all out parameters.
 | 
|       */
 | 
| -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
 | 
| -    virtual bool matchFamilyName(const char familyName[],
 | 
| -                                 SkTypeface::Style requested,
 | 
| -                                 FontIdentity* outFontIdentifier,
 | 
| -                                 SkString* outFamilyName,
 | 
| -                                 SkTypeface::Style* outStyle) = 0;
 | 
| -#else
 | 
|      virtual bool matchFamilyName(const char familyName[],
 | 
|                                   SkFontStyle requested,
 | 
|                                   FontIdentity* outFontIdentifier,
 | 
|                                   SkString* outFamilyName,
 | 
|                                   SkFontStyle* outStyle) = 0;
 | 
| -#endif
 | 
|  
 | 
|      /**
 | 
|       *  Given a FontRef, open a stream to access its data, or return null
 | 
| 
 |