corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1529241 - Handle emoji-zwj sequences in unicode::ClusterIterator so that we avoid breaking them across lines or during selection. r=m_kato

Browse Source 
Depends on D25100

Differential Revision: https://phabricator.services.mozilla.com/D25101
This commit is contained in:
Jonathan Kew
2019-03-28 09:57:40 +00:00
parent 1ca02b0b96
commit 084162a8f0
1 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
intl/unicharutil/util/nsUnicodeProperties.cpp
View File

@@ -225,8 +225,25 @@ void ClusterIterator::Next() {
} }
} }
const uint32_t kVS16 = 0xfe0f;
const uint32_t kZWJ = 0x200d;
// UTF-16 surrogate values for Fitzpatrick type modifiers
const uint32_t kFitzpatrickHigh = 0xD83C;
const uint32_t kFitzpatrickLowFirst = 0xDFFB;
const uint32_t kFitzpatrickLowLast = 0xDFFF;
bool baseIsEmoji = (GetEmojiPresentation(ch) == EmojiDefault) ||
(GetEmojiPresentation(ch) == TextDefault &&
((mPos < mLimit && *mPos == kVS16) ||
(mPos + 1 < mLimit &&
*mPos == kFitzpatrickHigh &&
*(mPos + 1) >= kFitzpatrickLowFirst &&
*(mPos + 1) <= kFitzpatrickLowLast)));
bool prevWasZwj = false;
while (mPos < mLimit) { while (mPos < mLimit) {
ch = *mPos; ch = *mPos;
size_t chLen = 1;
// Check for surrogate pairs; note that isolated surrogates will just // Check for surrogate pairs; note that isolated surrogates will just
// be treated as generic (non-cluster-extending) characters here, // be treated as generic (non-cluster-extending) characters here,
@@ -234,16 +251,21 @@ void ClusterIterator::Next() {
if (NS_IS_HIGH_SURROGATE(ch) && mPos < mLimit - 1 && if (NS_IS_HIGH_SURROGATE(ch) && mPos < mLimit - 1 &&
NS_IS_LOW_SURROGATE(*(mPos + 1))) { NS_IS_LOW_SURROGATE(*(mPos + 1))) {
ch = SURROGATE_TO_UCS4(ch, *(mPos + 1)); ch = SURROGATE_TO_UCS4(ch, *(mPos + 1));
chLen = 2;
} }
if (!IsClusterExtender(ch)) { bool extendCluster = IsClusterExtender(ch) ||
(baseIsEmoji && prevWasZwj &&
((GetEmojiPresentation(ch) == EmojiDefault) ||
(GetEmojiPresentation(ch) == TextDefault &&
mPos + chLen < mLimit &&
*(mPos + chLen) == kVS16)));
if (!extendCluster) {
break; break;
} }
mPos++; prevWasZwj = (ch == kZWJ);
if (!IS_IN_BMP(ch)) { mPos += chLen;
mPos++;
}
} }
NS_ASSERTION(mText < mPos && mPos <= mLimit, NS_ASSERTION(mText < mPos && mPos <= mLimit,