diff options
Diffstat (limited to 'include/ports/SkFontMgr_indirect.h')
-rw-r--r-- | include/ports/SkFontMgr_indirect.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index 251d74a83a..04e903ed14 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -50,11 +50,10 @@ protected: SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontStyle) const override; - SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const override; - SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override; - SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override; - - SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const override; + sk_sp<SkTypeface> onMakeFromStreamIndex(std::unique_ptr<SkStreamAsset>, int ttcIndex) const override; + sk_sp<SkTypeface> onMakeFromFile(const char path[], int ttcIndex) const override; + sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData>, int ttcIndex) const override; + sk_sp<SkTypeface> onLegacyMakeTypeface(const char familyName[], SkFontStyle) const override; private: SkTypeface* createTypefaceFromFontId(const SkFontIdentity& fontId) const; |