diff options
Diffstat (limited to 'include/minikin/FontCollection.h')
| -rw-r--r-- | include/minikin/FontCollection.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/include/minikin/FontCollection.h b/include/minikin/FontCollection.h index 12700c6..ffdb4d1 100644 --- a/include/minikin/FontCollection.h +++ b/include/minikin/FontCollection.h @@ -21,7 +21,6 @@ #include <minikin/MinikinRefCounted.h> #include <minikin/MinikinFont.h> -#include <minikin/SparseBitSet.h> #include <minikin/FontFamily.h> namespace android { @@ -52,17 +51,12 @@ private: static const int kLogCharsPerPage = 8; static const int kPageMask = (1 << kLogCharsPerPage) - 1; - struct FontInstance { - SparseBitSet* mCoverage; - FontFamily* mFamily; - }; - struct Range { size_t start; size_t end; }; - const FontInstance* getInstanceForChar(uint32_t ch, FontLanguage lang, int variant) const; + FontFamily* getFamilyForChar(uint32_t ch, FontLanguage lang, int variant) const; // static for allocating unique id's static uint32_t sNextId; @@ -74,10 +68,10 @@ private: uint32_t mMaxChar; // This vector has ownership of the bitsets and typeface objects. - std::vector<FontInstance> mInstances; + std::vector<FontFamily*> mFamilies; // This vector contains pointers into mInstances - std::vector<const FontInstance*> mInstanceVec; + std::vector<FontFamily*> mFamilyVec; // These are offsets into mInstanceVec, one range per page std::vector<Range> mRanges; |