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 /src/ports/SkRemotableFontMgr_win_dw.cpp | |
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 'src/ports/SkRemotableFontMgr_win_dw.cpp')
-rw-r--r-- | src/ports/SkRemotableFontMgr_win_dw.cpp | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/ports/SkRemotableFontMgr_win_dw.cpp b/src/ports/SkRemotableFontMgr_win_dw.cpp index c07c81fdae..fd38c4f73f 100644 --- a/src/ports/SkRemotableFontMgr_win_dw.cpp +++ b/src/ports/SkRemotableFontMgr_win_dw.cpp @@ -9,7 +9,6 @@ #include "SkDWrite.h" #include "SkDWriteFontFileStream.h" -#include "SkDataTable.h" #include "SkHRESULT.h" #include "SkMutex.h" #include "SkRemotableFontMgr.h" @@ -90,26 +89,6 @@ public: memcpy(fLocaleName.get(), localeName, localeNameLength * sizeof(WCHAR)); } - sk_sp<SkDataTable> getFamilyNames() const override { - int count = fFontCollection->GetFontFamilyCount(); - - SkDataTableBuilder names(1024); - for (int index = 0; index < count; ++index) { - SkTScopedComPtr<IDWriteFontFamily> fontFamily; - HRNM(fFontCollection->GetFontFamily(index, &fontFamily), - "Could not get requested family."); - - SkTScopedComPtr<IDWriteLocalizedStrings> familyNames; - HRNM(fontFamily->GetFamilyNames(&familyNames), "Could not get family names."); - - SkString familyName; - sk_get_locale_string(familyNames.get(), fLocaleName.get(), &familyName); - - names.appendString(familyName); - } - return names.detachDataTable(); - } - HRESULT FontToIdentity(IDWriteFont* font, SkFontIdentity* fontId) const { SkTScopedComPtr<IDWriteFontFace> fontFace; HRM(font->CreateFontFace(&fontFace), "Could not create font face."); |