| Index: src/ports/SkFontConfigInterface_direct.h
|
| diff --git a/src/ports/SkFontConfigInterface_direct.h b/src/ports/SkFontConfigInterface_direct.h
|
| index 22dd9f1994fd4ad1e11d4f4f58e1f9198dbd57ab..3f0af82699ee1f533474eeed9ba6e58251c51d36 100644
|
| --- a/src/ports/SkFontConfigInterface_direct.h
|
| +++ b/src/ports/SkFontConfigInterface_direct.h
|
| @@ -17,20 +17,12 @@ public:
|
| SkFontConfigInterfaceDirect();
|
| ~SkFontConfigInterfaceDirect() override;
|
|
|
| -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
|
| - bool matchFamilyName(const char familyName[],
|
| - SkTypeface::Style requested,
|
| - FontIdentity* outFontIdentifier,
|
| - SkString* outFamilyName,
|
| - SkTypeface::Style* outStyle) override;
|
| -#else
|
| bool matchFamilyName(const char familyName[],
|
| SkFontStyle requested,
|
| FontIdentity* outFontIdentifier,
|
| SkString* outFamilyName,
|
| SkFontStyle* outStyle) override;
|
|
|
| -#endif
|
| SkStreamAsset* openStream(const FontIdentity&) override;
|
|
|
| // new APIs
|
|
|