提交 35e4ebec 编写于 作者: R Raph Levien

Accept variation selector in emoji sequences - DO NOT MERGE

This patch basically ignores variation selectors for the purpose of
itemization into font runs. This allows GSUB to be applied when input
sequences contain variation selectors.

Bug: 25368653
Change-Id: I9c1d325ae0cd322c21b7e850d0ec4d73551b2372
上级 90a09c3f
......@@ -167,6 +167,10 @@ static bool isStickyWhitelisted(uint32_t c) {
return false;
}
static bool isVariationSelector(uint32_t c) {
return (0xFE00 <= c && c <= 0xFE0F) || (0xE0100 <= c && c <= 0xE01EF);
}
void FontCollection::itemize(const uint16_t *string, size_t string_size, FontStyle style,
vector<Run>* result) const {
FontLanguage lang = style.getLanguage();
......@@ -184,9 +188,11 @@ void FontCollection::itemize(const uint16_t *string, size_t string_size, FontSty
nShorts = 2;
}
}
// Continue using existing font as long as it has coverage and is whitelisted
// Continue using existing font as long as it has coverage and is whitelisted;
// also variation sequences continue existing run.
if (lastFamily == NULL
|| !(isStickyWhitelisted(ch) && lastFamily->getCoverage()->get(ch))) {
|| !((isStickyWhitelisted(ch) && lastFamily->getCoverage()->get(ch))
|| isVariationSelector(ch))) {
FontFamily* family = getFamilyForChar(ch, lang, variant);
if (i == 0 || family != lastFamily) {
size_t start = i;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册