diff options
| author |  Mike Reed <reed@google.com> | 2017-09-25 20:00:31 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-09-25 20:00:41 +0000 |
| commit | f40ae1a4b5365620463bd63b5140bd3fc78894a1 (patch) | |
| tree | 3070160f98d80ea9e2ab53eb8b06035d70582701 /src/ports/SkFontMgr_custom.h | |
| parent | a3ab53b93a40185d7f29409264f91b835ae8929e (diff) | |
Revert "migrate to sk_sp for SkFontMgr API"
This reverts commit 4bf296be2821d2bdd0afabae9fdfe18e7e9b59cb.
Reason for revert: need guard for flutter
Original change's description:
> migrate to sk_sp for SkFontMgr API
>
> Bug: skia:
> Change-Id: I1bf2a13537f67938cdc9956080065d10ea0bd1d8
> Reviewed-on: https://skia-review.googlesource.com/48740
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Reviewed-by: Ben Wagner <bungeman@google.com>
TBR=bungeman@google.com,reed@google.com
Change-Id: Ib0b2d00fcbcdb6131444f94d1046df6dae24f551
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/50940
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 e204c0aba0..f8d083c049 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; - 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; + 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; private: Families fFamilies; |