diff options
| author |  Herb Derby <herb@google.com> | 2017-01-20 16:07:52 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-01-23 17:09:37 +0000 |
| commit | 9adfef8680c22ce8980031b4bcb9f1fadd066a80 (patch) | |
| tree | 39cbe845eebfe3e1ce063910207b03d63443a29e /include/ports | |
| parent | 5b92e4ab8e1d238f3acbd775accae8c5436c1b71 (diff) | |
Remove public APIs that use SkDataTable.
Change-Id: Ibb8f987efc585713a6f8061c72fb416d07be13b1
Reviewed-on: https://skia-review.googlesource.com/7352
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkFontConfigInterface.h | 3 | ||||
| -rw-r--r-- | include/ports/SkFontMgr_indirect.h | 5 | ||||
| -rw-r--r-- | include/ports/SkRemotableFontMgr.h | 9 |
3 files changed, 0 insertions, 17 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index 74f766f52e..ff80e5fb38 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -109,9 +109,6 @@ public: */ static SkFontConfigInterface* GetSingletonDirectInterface(); - // New APIS, which have default impls for now (which do nothing) - - 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 6c258c851d..b9ab3ba913 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -11,7 +11,6 @@ #include "../private/SkMutex.h" #include "../private/SkOnce.h" #include "../private/SkTArray.h" -#include "SkDataTable.h" #include "SkFontMgr.h" #include "SkRefCnt.h" #include "SkRemotableFontMgr.h" @@ -95,10 +94,6 @@ private: mutable SkTArray<DataEntry> fDataCache; mutable SkMutex fDataCacheMutex; - mutable sk_sp<SkDataTable> fFamilyNames; - mutable SkOnce fFamilyNamesInitOnce; - static void set_up_family_names(const SkFontMgr_Indirect* self); - friend class SkStyleSet_Indirect; }; diff --git a/include/ports/SkRemotableFontMgr.h b/include/ports/SkRemotableFontMgr.h index 2e028cee26..12050c7e07 100644 --- a/include/ports/SkRemotableFontMgr.h +++ b/include/ports/SkRemotableFontMgr.h @@ -56,15 +56,6 @@ private: class SK_API SkRemotableFontMgr : public SkRefCnt { public: /** - * Returns the names of the known fonts on the system. - * Will not return NULL, will return an empty table if no families exist. - * - * The indexes may be used with getIndex(int) and - * matchIndexStyle(int, SkFontStyle). - */ - virtual sk_sp<SkDataTable> getFamilyNames() const = 0; - - /** * Returns all of the fonts with the given familyIndex. * Returns NULL if the index is out of bounds. * Returns empty if there are no fonts at the given index. |