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

Unified Diff: third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp

Issue 1757703003: Extend FontCache fallback API to support FontFallbackPriority (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments addressed Created 4 years, 10 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
Index: third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp
index 12cb486b07769dafd5237389795cb7d5142fd6a9..7c1ef8861ee3afea9ab3bdecfce8f5dc45ab0157 100644
--- a/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp
+++ b/third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp
@@ -386,7 +386,7 @@ UScriptCode getScript(int ucs4)
return script;
}
-const UChar* getFontBasedOnUnicodeBlock(int ucs4, SkFontMgr* fontManager)
+const UChar* getFontBasedOnUnicodeBlock(UBlockCode blockCode, SkFontMgr* fontManager)
{
static const UChar* emojiFonts[] = {L"Segoe UI Emoji", L"Segoe UI Symbol"};
static const UChar* mathFonts[] = {L"Cambria Math", L"Segoe UI Symbol", L"Code2000"};
@@ -410,8 +410,7 @@ const UChar* getFontBasedOnUnicodeBlock(int ucs4, SkFontMgr* fontManager)
initialized = true;
}
- UBlockCode block = ublock_getCode(ucs4);
- switch (block) {
+ switch (blockCode) {
case UBLOCK_EMOTICONS:
case UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT:
return emojiFont;
@@ -493,11 +492,14 @@ const UChar* getFallbackFamily(UChar32 character,
UScriptCode contentScript,
const AtomicString& contentLocale,
UScriptCode* scriptChecked,
+ FontFallbackPriority fallbackPriority,
SkFontMgr* fontManager)
{
ASSERT(character);
ASSERT(fontManager);
- const UChar* family = getFontBasedOnUnicodeBlock(character, fontManager);
+ UBlockCode block = fallbackPriority == FontFallbackPriority::EmojiEmoji ?
+ UBLOCK_EMOTICONS : ublock_getCode(character);
+ const UChar* family = getFontBasedOnUnicodeBlock(block, fontManager);
if (family) {
if (scriptChecked)
*scriptChecked = USCRIPT_INVALID_CODE;
« no previous file with comments | « third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.h ('k') | third_party/WebKit/Source/wtf/text/CharacterNames.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698