diff options
author | 2017-09-26 09:46:08 -0400 | |
---|---|---|
committer | 2017-09-26 14:05:18 +0000 | |
commit | 592273965a7fc7fc403252e420d15f6555b8f25d (patch) | |
tree | 9d5f6fa74228b81278bc97af1dc78d9587d63c08 /src/ports/SkFontMgr_custom.h | |
parent | f6f7cf60985d8e109cc136f25e2a3c3383ca05ea (diff) |
Revert "Revert "migrate to sk_sp for SkFontMgr API""
This reverts commit f40ae1a4b5365620463bd63b5140bd3fc78894a1.
Bug: skia:
Change-Id: I752606de92ea405d6e50219c98030409b00a2841
Reviewed-on: https://skia-review.googlesource.com/51160
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src/ports/SkFontMgr_custom.h')
-rw-r--r-- | src/ports/SkFontMgr_custom.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ports/SkFontMgr_custom.h b/src/ports/SkFontMgr_custom.h index f8d083c049..e204c0aba0 100644 --- a/src/ports/SkFontMgr_custom.h +++ b/src/ports/SkFontMgr_custom.h @@ -142,12 +142,12 @@ protected: SkUnichar character) const override; SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember, const SkFontStyle& fontStyle) const override; - SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const override; - SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override; - SkTypeface* onCreateFromStream(SkStreamAsset* s, const SkFontArguments& args) const override; - SkTypeface* onCreateFromFontData(std::unique_ptr<SkFontData> data) const override; - SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override; - SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle style) const override; + sk_sp<SkTypeface> onMakeFromData(sk_sp<SkData> data, int ttcIndex) const override; + sk_sp<SkTypeface> onMakeFromStreamIndex(std::unique_ptr<SkStreamAsset>, int ttcIndex) const override; + sk_sp<SkTypeface> onMakeFromStreamArgs(std::unique_ptr<SkStreamAsset>, const SkFontArguments&) const override; + sk_sp<SkTypeface> onMakeFromFontData(std::unique_ptr<SkFontData> data) const override; + sk_sp<SkTypeface> onMakeFromFile(const char path[], int ttcIndex) const override; + sk_sp<SkTypeface> onLegacyMakeTypeface(const char familyName[], SkFontStyle style) const override; private: Families fFamilies; |