diff options
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkFontConfigInterface.h | 2 | ||||
| -rw-r--r-- | include/ports/SkFontMgr_indirect.h | 2 | ||||
| -rw-r--r-- | include/ports/SkRemotableFontMgr.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index 536768a8bf..30fc8a35fb 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -111,7 +111,7 @@ public: // New APIS, which have default impls for now (which do nothing) - virtual SkDataTable* getFamilyNames() { return SkDataTable::NewEmpty(); } + virtual sk_sp<SkDataTable> getFamilyNames() { return SkDataTable::MakeEmpty(); } typedef SkRefCnt INHERITED; }; diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index d3f47cb82b..406a75a7ee 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -95,7 +95,7 @@ private: mutable SkTArray<DataEntry> fDataCache; mutable SkMutex fDataCacheMutex; - mutable SkAutoTUnref<SkDataTable> fFamilyNames; + mutable sk_sp<SkDataTable> fFamilyNames; mutable SkOnce fFamilyNamesInitOnce; static void set_up_family_names(const SkFontMgr_Indirect* self); diff --git a/include/ports/SkRemotableFontMgr.h b/include/ports/SkRemotableFontMgr.h index ddc8e50a12..2e028cee26 100644 --- a/include/ports/SkRemotableFontMgr.h +++ b/include/ports/SkRemotableFontMgr.h @@ -61,10 +61,8 @@ public: * * The indexes may be used with getIndex(int) and * matchIndexStyle(int, SkFontStyle). - * - * The caller must unref() the returned object. */ - virtual SkDataTable* getFamilyNames() const = 0; + virtual sk_sp<SkDataTable> getFamilyNames() const = 0; /** * Returns all of the fonts with the given familyIndex. |