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

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

Issue 1751973003: Modernize Japanese system font fallback list for Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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 unified diff | Download patch
« no previous file with comments | « third_party/WebKit/LayoutTests/media/track/track-cue-rendering-vertical.html ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2012 Google Inc. All rights reser ved. 2 * Copyright (c) 2006, 2007, 2008, 2009, 2010, 2012 Google Inc. All rights reser ved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 L"Ebrima", 0 }; 144 L"Ebrima", 0 };
145 static const UChar* georgianFonts[] = { L"Segoe UI", L"Sylfaen", 0 }; 145 static const UChar* georgianFonts[] = { L"Segoe UI", L"Sylfaen", 0 };
146 static const UChar* glagoliticFonts[] = { L"Segoe UI Historic", 146 static const UChar* glagoliticFonts[] = { L"Segoe UI Historic",
147 L"Segoe UI Symbol", 0 }; 147 L"Segoe UI Symbol", 0 };
148 static const UChar* gothicFonts[] = { L"Segoe UI Historic", 148 static const UChar* gothicFonts[] = { L"Segoe UI Historic",
149 L"Segoe UI Symbol", 0 }; 149 L"Segoe UI Symbol", 0 };
150 static const UChar* gujaratiFonts[] = { L"Nirmala UI", L"Shruti", 0 }; 150 static const UChar* gujaratiFonts[] = { L"Nirmala UI", L"Shruti", 0 };
151 static const UChar* gurmukhiFonts[] = { L"Nirmala UI", L"Raavi", 0 }; 151 static const UChar* gurmukhiFonts[] = { L"Nirmala UI", L"Raavi", 0 };
152 static const UChar* hangulFonts[] = { L"Malgun Gothic", L"Gulim", 0 }; 152 static const UChar* hangulFonts[] = { L"Malgun Gothic", L"Gulim", 0 };
153 static const UChar* hebrewFonts[] = { L"David", L"Segoe UI", 0 }; 153 static const UChar* hebrewFonts[] = { L"David", L"Segoe UI", 0 };
154 static const UChar* hiraganaFonts[] = { L"MS PGothic", L"Yu Gothic",
155 L"Microsoft YaHei", 0 };
156 static const UChar* imperialAramaicFonts[] = { L"Segoe UI Historic", 0 }; 154 static const UChar* imperialAramaicFonts[] = { L"Segoe UI Historic", 0 };
157 static const UChar* inscriptionalPahlaviFonts[] = { L"Segoe UI Historic", 155 static const UChar* inscriptionalPahlaviFonts[] = { L"Segoe UI Historic",
158 0 }; 156 0 };
159 static const UChar* inscriptionalParthianFonts[] = { L"Segoe UI Historic", 157 static const UChar* inscriptionalParthianFonts[] = { L"Segoe UI Historic",
160 0 }; 158 0 };
161 static const UChar* javaneseFonts[] = { L"Javanese Text", 0 }; 159 static const UChar* javaneseFonts[] = { L"Javanese Text", 0 };
162 static const UChar* kannadaFonts[] = { L"Tunga", L"Nirmala UI", 0 }; 160 static const UChar* kannadaFonts[] = { L"Tunga", L"Nirmala UI", 0 };
163 static const UChar* katakanaFonts[] = { L"MS PGothic", L"Yu Gothic", 161 static const UChar* katakanaOrHiraganaFonts[] = { L"Meiryo", L"Yu Gothic",
164 L"Microsoft YaHei", 0 }; 162 L"MS PGothic", L"Microsoft YaHei", 0 };
165 static const UChar* katakanaOrHiraganaFonts[] = { L"MS PGothic",
166 L"Yu Gothic", L"Microsoft YaHei", 0 };
167 static const UChar* kharoshthiFonts[] = { L"Segoe UI Historic", 0 }; 163 static const UChar* kharoshthiFonts[] = { L"Segoe UI Historic", 0 };
168 // Try Khmer OS before Vista fonts as it goes along better with Latin 164 // Try Khmer OS before Vista fonts as it goes along better with Latin
169 // and looks better/larger for the same size. 165 // and looks better/larger for the same size.
170 static const UChar* khmerFonts[] = { L"Leelawadee UI", L"Khmer UI", 166 static const UChar* khmerFonts[] = { L"Leelawadee UI", L"Khmer UI",
171 L"Khmer OS", L"MoolBoran", L"DaunPenh", 0 }; 167 L"Khmer OS", L"MoolBoran", L"DaunPenh", 0 };
172 static const UChar* laoFonts[] = { L"Leelawadee UI", L"Lao UI", 168 static const UChar* laoFonts[] = { L"Leelawadee UI", L"Lao UI",
173 L"DokChampa", L"Saysettha OT", L"Phetsarath OT", L"Code2000", 0 }; 169 L"DokChampa", L"Saysettha OT", L"Phetsarath OT", L"Code2000", 0 };
174 static const UChar* lisuFonts[] = { L"Segoe UI", 0 }; 170 static const UChar* lisuFonts[] = { L"Segoe UI", 0 };
175 static const UChar* lycianFonts[] = { L"Segoe UI Historic", 0 }; 171 static const UChar* lycianFonts[] = { L"Segoe UI Historic", 0 };
176 static const UChar* lydianFonts[] = { L"Segoe UI Historic", 0 }; 172 static const UChar* lydianFonts[] = { L"Segoe UI Historic", 0 };
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 { USCRIPT_DEVANAGARI, devanagariFonts }, 234 { USCRIPT_DEVANAGARI, devanagariFonts },
239 { USCRIPT_EGYPTIAN_HIEROGLYPHS, egyptianHieroglyphsFonts }, 235 { USCRIPT_EGYPTIAN_HIEROGLYPHS, egyptianHieroglyphsFonts },
240 { USCRIPT_ETHIOPIC, ethiopicFonts }, 236 { USCRIPT_ETHIOPIC, ethiopicFonts },
241 { USCRIPT_GEORGIAN, georgianFonts }, 237 { USCRIPT_GEORGIAN, georgianFonts },
242 { USCRIPT_GLAGOLITIC, glagoliticFonts }, 238 { USCRIPT_GLAGOLITIC, glagoliticFonts },
243 { USCRIPT_GOTHIC, gothicFonts }, 239 { USCRIPT_GOTHIC, gothicFonts },
244 { USCRIPT_GUJARATI, gujaratiFonts }, 240 { USCRIPT_GUJARATI, gujaratiFonts },
245 { USCRIPT_GURMUKHI, gurmukhiFonts }, 241 { USCRIPT_GURMUKHI, gurmukhiFonts },
246 { USCRIPT_HANGUL, hangulFonts }, 242 { USCRIPT_HANGUL, hangulFonts },
247 { USCRIPT_HEBREW, hebrewFonts }, 243 { USCRIPT_HEBREW, hebrewFonts },
248 { USCRIPT_HIRAGANA, hiraganaFonts }, 244 { USCRIPT_HIRAGANA, katakanaOrHiraganaFonts },
249 { USCRIPT_IMPERIAL_ARAMAIC, imperialAramaicFonts }, 245 { USCRIPT_IMPERIAL_ARAMAIC, imperialAramaicFonts },
250 { USCRIPT_INSCRIPTIONAL_PAHLAVI, inscriptionalPahlaviFonts }, 246 { USCRIPT_INSCRIPTIONAL_PAHLAVI, inscriptionalPahlaviFonts },
251 { USCRIPT_INSCRIPTIONAL_PARTHIAN, inscriptionalParthianFonts }, 247 { USCRIPT_INSCRIPTIONAL_PARTHIAN, inscriptionalParthianFonts },
252 { USCRIPT_JAVANESE, javaneseFonts }, 248 { USCRIPT_JAVANESE, javaneseFonts },
253 { USCRIPT_KANNADA, kannadaFonts }, 249 { USCRIPT_KANNADA, kannadaFonts },
254 { USCRIPT_KATAKANA, katakanaFonts }, 250 { USCRIPT_KATAKANA, katakanaOrHiraganaFonts },
255 { USCRIPT_KATAKANA_OR_HIRAGANA, katakanaOrHiraganaFonts }, 251 { USCRIPT_KATAKANA_OR_HIRAGANA, katakanaOrHiraganaFonts },
256 { USCRIPT_KHAROSHTHI, kharoshthiFonts }, 252 { USCRIPT_KHAROSHTHI, kharoshthiFonts },
257 { USCRIPT_KHMER, khmerFonts }, 253 { USCRIPT_KHMER, khmerFonts },
258 { USCRIPT_LAO, laoFonts }, 254 { USCRIPT_LAO, laoFonts },
259 { USCRIPT_LISU, lisuFonts }, 255 { USCRIPT_LISU, lisuFonts },
260 { USCRIPT_LYCIAN, lycianFonts }, 256 { USCRIPT_LYCIAN, lycianFonts },
261 { USCRIPT_LYDIAN, lydianFonts }, 257 { USCRIPT_LYDIAN, lydianFonts },
262 { USCRIPT_MALAYALAM, malayalamFonts }, 258 { USCRIPT_MALAYALAM, malayalamFonts },
263 { USCRIPT_MEROITIC_CURSIVE, meroiticCursiveFonts }, 259 { USCRIPT_MEROITIC_CURSIVE, meroiticCursiveFonts },
264 { USCRIPT_MONGOLIAN, mongolianFonts }, 260 { USCRIPT_MONGOLIAN, mongolianFonts },
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
549 family = L"lucida sans unicode"; 545 family = L"lucida sans unicode";
550 } 546 }
551 } 547 }
552 548
553 if (scriptChecked) 549 if (scriptChecked)
554 *scriptChecked = script; 550 *scriptChecked = script;
555 return family; 551 return family;
556 } 552 }
557 553
558 } // namespace blink 554 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/media/track/track-cue-rendering-vertical.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698