| Index: include/ports/SkFontMgr_indirect.h
|
| diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h
|
| index b3f31c3b8e92f7bdfbd20f8eb5bb11e3a309b6a8..5e8f1ede70266ddbbba2f5ace2fb2648c540f3a0 100644
|
| --- a/include/ports/SkFontMgr_indirect.h
|
| +++ b/include/ports/SkFontMgr_indirect.h
|
| @@ -54,11 +54,7 @@ protected:
|
| SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override;
|
| SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override;
|
|
|
| -#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE
|
| - SkTypeface* onLegacyCreateTypeface(const char familyName[], unsigned styleBits) const override;
|
| -#else
|
| SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const override;
|
| -#endif
|
|
|
| private:
|
| SkTypeface* createTypefaceFromFontId(const SkFontIdentity& fontId) const;
|
|
|