third_party/WebKit/Source/platform/fonts/SymbolsIterator.cpp - Issue 2603343002: Emoji fixes: Two professions and digits with VS16

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/fonts/SymbolsIterator.cpp

Issue 2603343002: Emoji fixes: Two professions and digits with VS16 (Closed)

Patch Set: Created 3 years, 12 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:

Index: third_party/WebKit/Source/platform/fonts/SymbolsIterator.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/SymbolsIterator.cpp b/third_party/WebKit/Source/platform/fonts/SymbolsIterator.cpp

index 199c52dfeaa67ba2b47bb232a298b2a27069dae5..61341c699ac92967d36734ccee2598fe776fd110 100644

--- a/third_party/WebKit/Source/platform/fonts/SymbolsIterator.cpp

+++ b/third_party/WebKit/Source/platform/fonts/SymbolsIterator.cpp

@@ -86,7 +86,8 @@ bool SymbolsIterator::consume(unsigned* symbolsLimit,

m_currentFontFallbackPriority = FontFallbackPriority::EmojiText;

}

- if (m_currentFontFallbackPriority == FontFallbackPriority::EmojiText &&

+ if ((m_currentFontFallbackPriority == FontFallbackPriority::EmojiText ||

+ Character::isEmojiKeycapBase(m_nextChar)) &&

peekChar == variationSelector16Character) {

m_currentFontFallbackPriority = FontFallbackPriority::EmojiEmoji;

}

« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/fonts/SymbolsIteratorTest.cpp » ('j') | no next file with comments »