Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't do layout in hasGlyph for codepoint + vs

Browse Source 
In the case where the input is a base codepoint + a variation selector,
the code currently checks hasVariationSelector and then does a layout,
checking for a single glyph. However, HarfBuzz in some cases will change
the VS into a space glyph, so hasGlyph will return false.

This patch makes hasGlyph rely entirely on the hasVariationSelector
method in the case of a base codepoint + a VS

Bug: 27531970
Bug: 28182689
Change-Id: Id190c427149213509f2d779ec1aa330feb4b62d8
This commit is contained in:
Raph Levien
2016-04-14 21:22:37 -07:00
parent be67c90f4c
commit 032a35954c
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/jni/android/graphics/Paint.cpp
View File

@@ -815,10 +815,15 @@ namespace PaintGlue {
}
if (prevCp != kStartOfString &&
((0xFE00 <= cp && cp <= 0xFE0F) || (0xE0100 <= cp && cp <= 0xE01EF)) &&
!MinikinUtils::hasVariationSelector(typeface, prevCp, cp)) {
// No font has a glyph for the code point and variation selector pair.
return false;
((0xFE00 <= cp && cp <= 0xFE0F) || (0xE0100 <= cp && cp <= 0xE01EF))) {
bool hasVS = MinikinUtils::hasVariationSelector(typeface, prevCp, cp);
if (!hasVS) {
// No font has a glyph for the code point and variation selector pair.
return false;
} else if (nChars == 1 && i + 1 == str.size()) {
// The string is just a codepoint and a VS, we have an authoritative answer
return true;
}
}
nChars++;
prevCp = cp;