Update font fallbacks for Win10

Source/platform/fonts/win/FontFallbackWin.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 89 matching lines @@
     };
 
     static const FontMap fontMap[] = {
         {USCRIPT_LATIN, L"times new roman"},
         {USCRIPT_GREEK, L"times new roman"},
         {USCRIPT_CYRILLIC, L"times new roman"},
         // FIXME: Consider trying new Vista fonts before XP fonts for CJK.
         // Some Vista users do want to use Vista cleartype CJK fonts. If we
         // did, the results of tests with CJK characters would have to be
         // regenerated for Vista.
-        {USCRIPT_SIMPLIFIED_HAN, L"simsun"},
-        {USCRIPT_TRADITIONAL_HAN, L"pmingliu"},
-        {USCRIPT_HIRAGANA, L"ms pgothic"},
-        {USCRIPT_KATAKANA, L"ms pgothic"},
-        {USCRIPT_KATAKANA_OR_HIRAGANA, L"ms pgothic"},
         {USCRIPT_THAANA, L"mv boli"},
         {USCRIPT_MONGOLIAN, L"mongolian balti"},
         // For USCRIPT_COMMON, we map blocks to scripts when
         // that makes sense.
     };
 
     struct ScriptToFontFamilies {
         UScriptCode script;
         const UChar** families;
     };
 
     // Kartika on Vista or earlier lacks the support for Chillu
     // letters added to Unicode 5.1.
     // Try AnjaliOldLipi (a very widely used Malaylalam font with the full
     // Unicode 5.x support) before falling back to Kartika.
-    static const UChar* malayalamFonts[] = {L"AnjaliOldLipi", L"Lohit Malayalam", L"Kartika", L"Rachana", 0};
+    static const UChar* malayalamFonts[] = {L"AnjaliOldLipi", L"Lohit Malayalam", L"Kartika", L"Rachana", L"Nirmala UI", 0};
     // Try Khmer OS before Vista fonts because 'Khmer OS' goes along better
     // with Latin and looks better/larger for the same size.
-    static const UChar* khmerFonts[] = {L"Khmer OS", L"MoolBoran", L"DaunPenh", L"Code2000", 0};
+    static const UChar* khmerFonts[] = {L"Leelawadee UI", L"Khmer OS", L"MoolBoran", L"DaunPenh", L"Code2000", 0};
     // For the following 6 scripts, two or fonts are listed. The fonts in
     // the 1st slot are not available on Windows XP. To support these
     // scripts on XP, listed in the rest of slots are widely used
     // fonts.
-    static const UChar* ethiopicFonts[] = {L"Nyala", L"Abyssinica SIL", L"Ethiopia Jiret", L"Visual Geez Unicode", L"GF Zemen Unicode", 0};
-    static const UChar* oriyaFonts[] = {L"Kalinga", L"ori1Uni", L"Lohit Oriya", 0};
-    static const UChar* laoFonts[] = {L"DokChampa", L"Saysettha OT", L"Phetsarath OT", L"Code2000", 0};
+    static const UChar* ethiopicFonts[] = {L"Nyala", L"Abyssinica SIL", L"Ethiopia Jiret", L"Visual Geez Unicode", L"GF Zemen Unicode", L"Ebrima", 0};
+    static const UChar* oriyaFonts[] = {L"Kalinga", L"ori1Uni", L"Lohit Oriya", L"Nirmala UI", 0};
+    static const UChar* laoFonts[] = {L"Leelawadee UI", L"DokChampa", L"Saysettha OT", L"Phetsarath OT", L"Code2000", 0};
     static const UChar* tibetanFonts[] = {L"Microsoft Himalaya", L"Jomolhari", L"Tibetan Machine Uni", 0};
-    static const UChar* sinhalaFonts[] = {L"Iskoola Pota", L"AksharUnicode", 0};
+    static const UChar* sinhalaFonts[] = {L"Iskoola Pota", L"AksharUnicode", L"Nirmala UI", 0};
     static const UChar* yiFonts[] = {L"Microsoft Yi Balti", L"Nuosu SIL", L"Code2000", 0};
     // http://www.bethmardutho.org/support/meltho/download/index.php
     static const UChar* syriacFonts[] = {L"Estrangelo Edessa", L"Estrangelo Nisibin", L"Code2000", 0};
     static const UChar* myanmarFonts[] = {L"Myanmar Text", L"Padauk", L"Parabaik", L"Myanmar3", L"Code2000", 0};
     static const UChar* gothicFonts[] = {L"Segoe UI Symbol", 0};
     static const UChar* hangulFonts[] = {L"gulim", L"Malgun Gothic", 0};
     static const UChar* devanagariFonts[] = {L"mangal", L"Nirmala UI", 0};
     static const UChar* gujaratiFonts[] = {L"shruti", L"Nirmala UI", 0};
     static const UChar* bengaliFonts[] = {L"vrinda", L"Nirmala UI", 0};
     static const UChar* teluguFonts[] = {L"gautami", L"Nirmala UI", 0};
     static const UChar* tamilFonts[] = {L"latha", L"Nirmala UI", 0};
     static const UChar* kannadaFonts[] = {L"tunga", L"Nirmala UI", 0};
     static const UChar* gurumukhiFonts[] = {L"raavi", L"Nirmala UI", 0};
     static const UChar* thaiFonts[] = {L"tahoma", L"Leelawadee UI", L"Leelawadee", 0};
     static const UChar* hebrewFonts[] = {L"david", L"Segoe UI", 0};
     static const UChar* arabicFonts[] = {L"tahoma", L"Segoe UI", 0};
     static const UChar* georgianFonts[] = {L"sylfaen", L"Segoe UI", 0};
     static const UChar* armenianFonts[] = {L"sylfaen", L"Segoe UI", 0};
     static const UChar* canadianAboriginalFonts[] = {L"euphemia", L"Gadugi", 0};
     static const UChar* cherokeeFonts[] = {L"plantagenet cherokee", L"Gadugi", 0};
+    static const UChar* simplifiedHanFonts[] = {L"simsun", L"Microsoft YaHei", 0};
+    static const UChar* traditionalHanFonts[] = {L"pmingliu", L"Microsoft JhengHei", 0};
+    static const UChar* hiraganaFonts[] = {L"ms pgothic", L"Yu Gothic", L"Microsoft YaHei", 0};
+    static const UChar* katakanaFonts[] = {L"ms pgothic", L"Yu Gothic", L"Microsoft YaHei", 0};
+    static const UChar* katakanaOrHiraganaFonts[] = {L"ms pgothic", L"Yu Gothic", L"Microsoft YaHei", 0};
 
     static const ScriptToFontFamilies scriptToFontFamilies[] = {
         {USCRIPT_MALAYALAM, malayalamFonts},
         {USCRIPT_KHMER, khmerFonts},
         {USCRIPT_ETHIOPIC, ethiopicFonts},
         {USCRIPT_ORIYA, oriyaFonts},
         {USCRIPT_LAO, laoFonts},
         {USCRIPT_TIBETAN, tibetanFonts},
         {USCRIPT_SINHALA, sinhalaFonts},
         {USCRIPT_YI, yiFonts},
         {USCRIPT_SYRIAC, syriacFonts},
         {USCRIPT_MYANMAR, myanmarFonts},
         {USCRIPT_GOTHIC, gothicFonts},
         {USCRIPT_HANGUL, hangulFonts},
         {USCRIPT_DEVANAGARI, devanagariFonts},
         {USCRIPT_GUJARATI, gujaratiFonts},
         {USCRIPT_BENGALI, bengaliFonts},
         {USCRIPT_TELUGU, teluguFonts},
         {USCRIPT_TAMIL, tamilFonts},
         {USCRIPT_KANNADA, kannadaFonts},
         {USCRIPT_GURMUKHI, gurumukhiFonts},
         {USCRIPT_THAI, thaiFonts},
         {USCRIPT_HEBREW, hebrewFonts},
         {USCRIPT_ARABIC, arabicFonts},
         {USCRIPT_GEORGIAN, georgianFonts},
         {USCRIPT_ARMENIAN, armenianFonts},
         {USCRIPT_CANADIAN_ABORIGINAL, canadianAboriginalFonts},
         {USCRIPT_CHEROKEE, cherokeeFonts},
+        {USCRIPT_SIMPLIFIED_HAN, simplifiedHanFonts},
+        {USCRIPT_TRADITIONAL_HAN, traditionalHanFonts},
+        {USCRIPT_HIRAGANA, hiraganaFonts},
+        {USCRIPT_KATAKANA, katakanaFonts},
+        {USCRIPT_KATAKANA_OR_HIRAGANA, katakanaOrHiraganaFonts},
     };
 
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(fontMap); ++i)
         scriptFontMap[fontMap[i].script] = fontMap[i].family;
 
     // FIXME: Instead of scanning the hard-coded list, we have to
     // use EnumFont* to 'inspect' fonts to pick up fonts covering scripts
     // when it's possible (e.g. using OS/2 table). If we do that, this
     // had better be pulled out of here.
     for (size_t i = 0; i < WTF_ARRAY_LENGTH(scriptToFontFamilies); ++i) {
@@ skipping 204 matching lines @@
             family = L"lucida sans unicode";
         }
     }
 
     if (scriptChecked)
         *scriptChecked = script;
     return family;
 }
 
 } // namespace blink