diff options
author | Seigo Nonaka <nona@google.com> | 2016-03-07 18:43:15 -0800 |
---|---|---|
committer | Seigo Nonaka <nona@google.com> | 2016-04-15 12:45:04 +0900 |
commit | 994aa84f7b18466806fe552ea57da1852b909f24 (patch) | |
tree | a4c9327c574989b4971e75e8bc3758b175724754 /include | |
parent | b1203b648acb109fddd537f8d76d168b7f70103e (diff) | |
download | android_frameworks_minikin-994aa84f7b18466806fe552ea57da1852b909f24.tar.gz android_frameworks_minikin-994aa84f7b18466806fe552ea57da1852b909f24.tar.bz2 android_frameworks_minikin-994aa84f7b18466806fe552ea57da1852b909f24.zip |
Returns hasVariationSelector true for VS15/VS16
Minikin has a special font fallback for VS15/VS16, so
hasVariationSelector for emojis with VS15/VS16 should always return
true.
Bug: 27531970
Change-Id: Ieebd58f48b135b6ec50d999df68dcc09b1284606
Diffstat (limited to 'include')
-rw-r--r-- | include/minikin/FontFamily.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/minikin/FontFamily.h b/include/minikin/FontFamily.h index 149dc7b..81033d2 100644 --- a/include/minikin/FontFamily.h +++ b/include/minikin/FontFamily.h @@ -100,7 +100,7 @@ struct FakedFont { class FontFamily : public MinikinRefCounted { public: - FontFamily() {} + FontFamily(); FontFamily(int variant); @@ -126,6 +126,7 @@ public: size_t getNumFonts() const; MinikinFont* getFont(size_t index) const; FontStyle getStyle(size_t index) const; + bool isColorEmojiFamily() const; // Get Unicode coverage. Lifetime of returned bitset is same as receiver. May return nullptr on // error. @@ -133,7 +134,7 @@ public: // Returns true if the font has a glyph for the code point and variation selector pair. // Caller should acquire a lock before calling the method. - bool hasVariationSelector(uint32_t codepoint, uint32_t variationSelector); + bool hasGlyph(uint32_t codepoint, uint32_t variationSelector); // Returns true if this font family has a variaion sequence table (cmap format 14 subtable). bool hasVSTable() const; |