Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1715)

Unified Diff: Source/platform/fonts/shaping/HarfBuzzShaper.cpp

Issue 1144033004: Unicode Variation Selectors support in collectCandidateRuns (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Avoid using wcslen() in tests Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/platform/fonts/Character.h ('k') | Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/platform/fonts/shaping/HarfBuzzShaper.cpp
diff --git a/Source/platform/fonts/shaping/HarfBuzzShaper.cpp b/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
index 44fcb3245b14168d38ef1e73f4016025a5fbcc78..64f31044708cba9bb1d2af23a293126787b3a5be 100644
--- a/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
+++ b/Source/platform/fonts/shaping/HarfBuzzShaper.cpp
@@ -579,9 +579,10 @@ static inline bool collectCandidateRuns(const UChar* normalizedBuffer,
if (Character::treatAsZeroWidthSpace(character))
continue;
if ((U_GET_GC_MASK(character) & U_GC_M_MASK)
- && currentFontData->canRenderCombiningCharacterSequence(
- currentCharacterPosition,
- iterator.glyphEnd() - currentCharacterPosition))
+ && (Character::isUnicodeVariationSelector(character)
+ || currentFontData->canRenderCombiningCharacterSequence(
+ currentCharacterPosition,
+ iterator.glyphEnd() - currentCharacterPosition)))
continue;
nextFontData = font->glyphDataForCharacter(character, false, isSpaceNormalize).fontData;
« no previous file with comments | « Source/platform/fonts/Character.h ('k') | Source/platform/fonts/shaping/HarfBuzzShaperTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698