aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontMgr_FontConfigInterface.cpp
diff options
context:
space:
mode:
authorGravatar Herb Derby <herb@google.com>2017-01-20 16:07:52 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-01-23 17:09:37 +0000
commit9adfef8680c22ce8980031b4bcb9f1fadd066a80 (patch)
tree39cbe845eebfe3e1ce063910207b03d63443a29e /src/ports/SkFontMgr_FontConfigInterface.cpp
parent5b92e4ab8e1d238f3acbd775accae8c5436c1b71 (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 'src/ports/SkFontMgr_FontConfigInterface.cpp')
-rw-r--r--src/ports/SkFontMgr_FontConfigInterface.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/ports/SkFontMgr_FontConfigInterface.cpp b/src/ports/SkFontMgr_FontConfigInterface.cpp
index f5e3ef0e05..4795ba5974 100644
--- a/src/ports/SkFontMgr_FontConfigInterface.cpp
+++ b/src/ports/SkFontMgr_FontConfigInterface.cpp
@@ -154,7 +154,6 @@ static bool find_by_FontIdentity(SkTypeface* cachedTypeface, void* ctx) {
class SkFontMgr_FCI : public SkFontMgr {
sk_sp<SkFontConfigInterface> fFCI;
- sk_sp<SkDataTable> fFamilyNames;
SkTypeface_FreeType::Scanner fScanner;
mutable SkMutex fMutex;
@@ -168,21 +167,21 @@ class SkFontMgr_FCI : public SkFontMgr {
public:
SkFontMgr_FCI(sk_sp<SkFontConfigInterface> fci)
: fFCI(std::move(fci))
- , fFamilyNames(fFCI->getFamilyNames())
, fCache(kMaxSize)
{}
protected:
int onCountFamilies() const override {
- return fFamilyNames->count();
+ return 0;
}
void onGetFamilyName(int index, SkString* familyName) const override {
- familyName->set(fFamilyNames->atStr(index));
+ SkFAIL("Not implemented.");
}
SkFontStyleSet* onCreateStyleSet(int index) const override {
- return this->onMatchFamily(fFamilyNames->atStr(index));
+ SkFAIL("Not implemented.");
+ return nullptr;
}
SkFontStyleSet* onMatchFamily(const char familyName[]) const override {