diff options
| author |  scroggo <scroggo@google.com> | 2016-05-12 06:22:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-12 06:22:30 -0700 |
| commit | 9a9a7b29e5e5916a7b6453cd124ca437f14b9da4 (patch) | |
| tree | ad5b560f6ed5da12040e5665282fd2227c305ff8 /include/ports | |
| parent | a1b283345b27fef91908b104a30cb89e6fbdaade (diff) | |
Revert of Move SkTypeface to sk_sp. (patchset #5 id:80001 of https://codereview.chromium.org/1933393002/ )
Reason for revert:
fontmgr_iterAndroid failing to draw emoji. E.g. 6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm">https://gold.skia.org/search2?blame=6296da736fbf40aae881650c239420f64e576c3f&unt=true&head=true&query=source_type%3Dgm
Original issue's description:
> Move SkTypeface to sk_sp.
>
> Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f
TBR=reed@google.com,fmalita@chromium.org,tomhudson@google.com,bungeman@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review-Url: https://codereview.chromium.org/1974783002
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkFontConfigInterface.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index dfa5bd0b13..9f98e356d2 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -97,15 +97,12 @@ public: * * The default implementation simply returns a new typeface built using data obtained from * openStream(), but derived classes may implement more complex caching schemes. + * + * Callers are responsible for unref-ing the result. */ - virtual sk_sp<SkTypeface> makeTypeface(const FontIdentity& identity) { - return SkTypeface::MakeFromStream(this->openStream(identity), identity.fTTCIndex); - } -#ifdef SK_SUPPORT_LEGACY_TYPEFACE_PTR virtual SkTypeface* createTypeface(const FontIdentity& identity) { - return this->makeTypeface(identity).release(); + return SkTypeface::CreateFromStream(this->openStream(identity), identity.fTTCIndex); } -#endif /** * Return a singleton instance of a direct subclass that calls into |