diff options
| author |  bungeman <bungeman@google.com> | 2016-09-16 06:24:20 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-09-16 06:24:20 -0700 |
| commit | f93d71122e4fcfcdc674a0163455990b13855f2f (patch) | |
| tree | b3713fad2da586bf997264247961c1a91453c383 /include/ports | |
| parent | f560ef86813f712eff70feb9b00b70d0fe92c3cd (diff) | |
SkFontData to use smart pointers.
The SkFontData type is not exposed externally, so any method which uses
it can be updated to use smart pointers without affecting external
users. Updating this first will make updating the public API much
easier.
This also updates SkStreamAsset* SkStream::NewFromFile(const char*) to
std::unique_ptr<SkStreamAsset> SkStream::MakeFromFile(const char*). It
appears that no one outside Skia is currently using SkStream::NewfromFile
so this is a good time to update it as well.
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2339273002
Committed: https://skia.googlesource.com/skia/+/d8c2476a8b1e1e1a1771b17e8dd4db8645914f8c
Review-Url: https://codereview.chromium.org/2339273002
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkFontMgr.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/include/ports/SkFontMgr.h b/include/ports/SkFontMgr.h index a5b78c6241..28e374f753 100644 --- a/include/ports/SkFontMgr.h +++ b/include/ports/SkFontMgr.h @@ -150,11 +150,10 @@ public: /** * Create a typeface from the specified font data. - * Takes ownership of the font data, so the caller should not reference it again. * Will return NULL if the typeface could not be created. * The caller must call unref() on the returned object if it is not null. */ - SkTypeface* createFromFontData(SkFontData*) const; + SkTypeface* createFromFontData(std::unique_ptr<SkFontData>) const; /** * Create a typeface for the specified fileName and TTC index @@ -192,7 +191,10 @@ protected: virtual SkTypeface* onCreateFromStream(SkStreamAsset*, int ttcIndex) const = 0; // TODO: make pure virtual. virtual SkTypeface* onCreateFromStream(SkStreamAsset*, const FontParameters&) const; - virtual SkTypeface* onCreateFromFontData(SkFontData*) const; + virtual SkTypeface* onCreateFromFontData(std::unique_ptr<SkFontData>) const; +#ifdef SK_DECLARE_LEGACY_CREATE_FROM_FONTDATA + virtual SkTypeface* onCreateFromFontData(SkFontData*) const { return nullptr; }; +#endif virtual SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const = 0; virtual SkTypeface* onLegacyCreateTypeface(const char familyName[], SkFontStyle) const = 0; |