| Index: Source/platform/fonts/win/FontFallbackWin.cpp
|
| diff --git a/Source/platform/fonts/win/FontFallbackWin.cpp b/Source/platform/fonts/win/FontFallbackWin.cpp
|
| index bde67857344e53832311bdc02184ce6e62a73c69..7d2f8f43ab570ab92c67ebb4512ba21c6b859db3 100644
|
| --- a/Source/platform/fonts/win/FontFallbackWin.cpp
|
| +++ b/Source/platform/fonts/win/FontFallbackWin.cpp
|
| @@ -297,10 +297,8 @@
|
| const UChar* getFontBasedOnUnicodeBlock(int ucs4, 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"};
|
| static const UChar* symbolFont = L"Segoe UI Symbol";
|
| static const UChar* emojiFont = 0;
|
| - static const UChar* mathFont = 0;
|
| static bool initialized = false;
|
| if (!initialized) {
|
| for (size_t i = 0; i < WTF_ARRAY_LENGTH(emojiFonts); i++) {
|
| @@ -309,43 +307,23 @@
|
| break;
|
| }
|
| }
|
| - for (size_t i = 0; i < WTF_ARRAY_LENGTH(mathFonts); i++) {
|
| - if (isFontPresent(mathFonts[i], fontManager)) {
|
| - mathFont = mathFonts[i];
|
| - break;
|
| - }
|
| - }
|
| initialized = true;
|
| }
|
|
|
| UBlockCode block = ublock_getCode(ucs4);
|
| switch (block) {
|
| case UBLOCK_EMOTICONS:
|
| - case UBLOCK_ENCLOSED_ALPHANUMERIC_SUPPLEMENT:
|
| return emojiFont;
|
| case UBLOCK_PLAYING_CARDS:
|
| case UBLOCK_MISCELLANEOUS_SYMBOLS:
|
| - case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_ARROWS:
|
| case UBLOCK_MISCELLANEOUS_SYMBOLS_AND_PICTOGRAPHS:
|
| + case UBLOCK_MISCELLANEOUS_TECHNICAL:
|
| case UBLOCK_TRANSPORT_AND_MAP_SYMBOLS:
|
| case UBLOCK_ALCHEMICAL_SYMBOLS:
|
| case UBLOCK_RUNIC:
|
| + case UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS:
|
| case UBLOCK_DINGBATS:
|
| - case UBLOCK_GOTHIC:
|
| return symbolFont;
|
| - case UBLOCK_ARROWS:
|
| - case UBLOCK_MATHEMATICAL_OPERATORS:
|
| - case UBLOCK_MISCELLANEOUS_TECHNICAL:
|
| - case UBLOCK_GEOMETRIC_SHAPES:
|
| - case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_A:
|
| - case UBLOCK_SUPPLEMENTAL_ARROWS_A:
|
| - case UBLOCK_SUPPLEMENTAL_ARROWS_B:
|
| - case UBLOCK_MISCELLANEOUS_MATHEMATICAL_SYMBOLS_B:
|
| - case UBLOCK_SUPPLEMENTAL_MATHEMATICAL_OPERATORS:
|
| - case UBLOCK_MATHEMATICAL_ALPHANUMERIC_SYMBOLS:
|
| - case UBLOCK_ARABIC_MATHEMATICAL_ALPHABETIC_SYMBOLS:
|
| - case UBLOCK_GEOMETRIC_SHAPES_EXTENDED:
|
| - return mathFont;
|
| default:
|
| return 0;
|
| };
|
|
|