diff options
| author |  bungeman <bungeman@google.com> | 2016-02-17 13:13:44 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-17 13:13:44 -0800 |
| commit | bf521ff9415b3bdb1acde7b8d18139df176236e5 (patch) | |
| tree | ed1142b7cc1b6fbeb539ad975aa802bb3650f935 /include/ports | |
| parent | 82709da1221357d4d5c38aa5a39fc301129ccf7d (diff) | |
Move SkTArray to include/private.
TBR=reed
Agreed moving to private is good.
Review URL: https://codereview.chromium.org/1702073002
Diffstat (limited to 'include/ports')
| -rw-r--r-- | include/ports/SkFontConfigInterface.h | 6 | ||||
| -rw-r--r-- | include/ports/SkFontMgr_indirect.h | 4 |
2 files changed, 2 insertions, 8 deletions
diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h index 304961fd78..063cb9d553 100644 --- a/include/ports/SkFontConfigInterface.h +++ b/include/ports/SkFontConfigInterface.h @@ -11,7 +11,6 @@ #include "SkDataTable.h" #include "SkFontStyle.h" #include "SkRefCnt.h" -#include "SkTArray.h" #include "SkTypeface.h" struct SkBaseMutex; @@ -116,11 +115,6 @@ public: // New APIS, which have default impls for now (which do nothing) virtual SkDataTable* getFamilyNames() { return SkDataTable::NewEmpty(); } - virtual bool matchFamilySet(const char[] /*inFamilyName*/, - SkString* /*outFamilyName*/, - SkTArray<FontIdentity>*) { - return false; - } typedef SkRefCnt INHERITED; }; diff --git a/include/ports/SkFontMgr_indirect.h b/include/ports/SkFontMgr_indirect.h index 9d96fee687..37502d2404 100644 --- a/include/ports/SkFontMgr_indirect.h +++ b/include/ports/SkFontMgr_indirect.h @@ -8,12 +8,12 @@ #ifndef SkFontMgr_indirect_DEFINED #define SkFontMgr_indirect_DEFINED +#include "../private/SkMutex.h" +#include "../private/SkTArray.h" #include "SkDataTable.h" #include "SkFontMgr.h" -#include "../private/SkMutex.h" #include "SkRefCnt.h" #include "SkRemotableFontMgr.h" -#include "SkTArray.h" #include "SkTypeface.h" #include "SkTypes.h" |