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

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

Issue 1784913003: Try newer Chinese and Japanese fonts before old fonts Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « no previous file | 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", 154 static const UChar* hiraganaFonts[] = { L"Microsoft YaHei",
155 L"Microsoft YaHei", 0 }; 155 L"Yu Gothic", L"MS PGothic", 0 };
156 static const UChar* imperialAramaicFonts[] = { L"Segoe UI Historic", 0 }; 156 static const UChar* imperialAramaicFonts[] = { L"Segoe UI Historic", 0 };
157 static const UChar* inscriptionalPahlaviFonts[] = { L"Segoe UI Historic", 157 static const UChar* inscriptionalPahlaviFonts[] = { L"Segoe UI Historic",
158 0 }; 158 0 };
159 static const UChar* inscriptionalParthianFonts[] = { L"Segoe UI Historic", 159 static const UChar* inscriptionalParthianFonts[] = { L"Segoe UI Historic",
160 0 }; 160 0 };
161 static const UChar* javaneseFonts[] = { L"Javanese Text", 0 }; 161 static const UChar* javaneseFonts[] = { L"Javanese Text", 0 };
162 static const UChar* kannadaFonts[] = { L"Tunga", L"Nirmala UI", 0 }; 162 static const UChar* kannadaFonts[] = { L"Tunga", L"Nirmala UI", 0 };
163 static const UChar* katakanaFonts[] = { L"MS PGothic", L"Yu Gothic", 163 static const UChar* katakanaFonts[] = { L"MS PGothic", L"Yu Gothic",
164 L"Microsoft YaHei", 0 }; 164 L"Microsoft YaHei", 0 };
165 static const UChar* katakanaOrHiraganaFonts[] = { L"MS PGothic", 165 static const UChar* katakanaOrHiraganaFonts[] = { L"MS PGothic",
(...skipping 25 matching lines...) Expand all
191 static const UChar* oldSouthArabianFonts[] = { L"Segoe UI Historic", 0 }; 191 static const UChar* oldSouthArabianFonts[] = { L"Segoe UI Historic", 0 };
192 static const UChar* oriyaFonts[] = { L"Kalinga", L"ori1Uni", 192 static const UChar* oriyaFonts[] = { L"Kalinga", L"ori1Uni",
193 L"Lohit Oriya", L"Nirmala UI", 0 }; 193 L"Lohit Oriya", L"Nirmala UI", 0 };
194 static const UChar* orkhonFonts[] = { L"Segoe UI Historic", 194 static const UChar* orkhonFonts[] = { L"Segoe UI Historic",
195 L"Segoe UI Symbol", 0 }; 195 L"Segoe UI Symbol", 0 };
196 static const UChar* osmanyaFonts[] = { L"Ebrima", 0 }; 196 static const UChar* osmanyaFonts[] = { L"Ebrima", 0 };
197 static const UChar* phagsPaFonts[] = { L"Microsoft PhagsPa", 0 }; 197 static const UChar* phagsPaFonts[] = { L"Microsoft PhagsPa", 0 };
198 static const UChar* runicFonts[] = { L"Segoe UI Historic", 198 static const UChar* runicFonts[] = { L"Segoe UI Historic",
199 L"Segoe UI Symbol", 0 }; 199 L"Segoe UI Symbol", 0 };
200 static const UChar* shavianFonts[] = { L"Segoe UI Historic", 0 }; 200 static const UChar* shavianFonts[] = { L"Segoe UI Historic", 0 };
201 static const UChar* simplifiedHanFonts[] = { L"simsun", L"Microsoft YaHei", 201 static const UChar* simplifiedHanFonts[] = { L"Microsoft YaHei",
202 0 }; 202 L"simsun", 0 };
203 static const UChar* sinhalaFonts[] = { L"Iskoola Pota", L"AksharUnicode", 203 static const UChar* sinhalaFonts[] = { L"Iskoola Pota", L"AksharUnicode",
204 L"Nirmala UI", 0 }; 204 L"Nirmala UI", 0 };
205 static const UChar* soraSompengFonts[] = { L"Nirmala UI", 0 }; 205 static const UChar* soraSompengFonts[] = { L"Nirmala UI", 0 };
206 static const UChar* symbolsFonts[] = { L"Segoe UI Symbol", 0 }; 206 static const UChar* symbolsFonts[] = { L"Segoe UI Symbol", 0 };
207 static const UChar* syriacFonts[] = { L"Estrangelo Edessa", 207 static const UChar* syriacFonts[] = { L"Estrangelo Edessa",
208 L"Estrangelo Nisibin", L"Code2000", 0 }; 208 L"Estrangelo Nisibin", L"Code2000", 0 };
209 static const UChar* taiLeFonts[] = { L"Microsoft Tai Le", 0 }; 209 static const UChar* taiLeFonts[] = { L"Microsoft Tai Le", 0 };
210 static const UChar* tamilFonts[] = { L"Nirmala UI", L"Latha", 0 }; 210 static const UChar* tamilFonts[] = { L"Nirmala UI", L"Latha", 0 };
211 static const UChar* teluguFonts[] = { L"Nirmala UI", L"Gautami", 0 }; 211 static const UChar* teluguFonts[] = { L"Nirmala UI", L"Gautami", 0 };
212 static const UChar* thaanaFonts[] = { L"MV Boli", 0 }; 212 static const UChar* thaanaFonts[] = { L"MV Boli", 0 };
213 static const UChar* thaiFonts[] = { L"Tahoma", L"Leelawadee UI", 213 static const UChar* thaiFonts[] = { L"Tahoma", L"Leelawadee UI",
214 L"Leelawadee", 0 }; 214 L"Leelawadee", 0 };
215 static const UChar* tibetanFonts[] = { L"Microsoft Himalaya", L"Jomolhari", 215 static const UChar* tibetanFonts[] = { L"Microsoft Himalaya", L"Jomolhari",
216 L"Tibetan Machine Uni", 0 }; 216 L"Tibetan Machine Uni", 0 };
217 static const UChar* tifinaghFonts[] = { L"Ebrima", 0 }; 217 static const UChar* tifinaghFonts[] = { L"Ebrima", 0 };
218 static const UChar* traditionalHanFonts[] = { L"pmingliu", 218 static const UChar* traditionalHanFonts[] = { L"Microsoft JhengHei",
219 L"Microsoft JhengHei", 0 }; 219 L"pmingliu", 0 };
220 static const UChar* vaiFonts[] = { L"Ebrima", 0 }; 220 static const UChar* vaiFonts[] = { L"Ebrima", 0 };
221 static const UChar* yiFonts[] = { L"Microsoft Yi Baiti", L"Nuosu SIL", 221 static const UChar* yiFonts[] = { L"Microsoft Yi Baiti", L"Nuosu SIL",
222 L"Code2000", 0 }; 222 L"Code2000", 0 };
223 223
224 static const ScriptToFontFamilies scriptToFontFamilies[] = { 224 static const ScriptToFontFamilies scriptToFontFamilies[] = {
225 { USCRIPT_ARABIC, arabicFonts }, 225 { USCRIPT_ARABIC, arabicFonts },
226 { USCRIPT_ARMENIAN, armenianFonts }, 226 { USCRIPT_ARMENIAN, armenianFonts },
227 { USCRIPT_BENGALI, bengaliFonts }, 227 { USCRIPT_BENGALI, bengaliFonts },
228 { USCRIPT_BRAHMI, brahmiFonts }, 228 { USCRIPT_BRAHMI, brahmiFonts },
229 { USCRIPT_BRAILLE, brailleFonts }, 229 { USCRIPT_BRAILLE, brailleFonts },
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
547 family = L"lucida sans unicode"; 547 family = L"lucida sans unicode";
548 } 548 }
549 } 549 }
550 550
551 if (scriptChecked) 551 if (scriptChecked)
552 *scriptChecked = script; 552 *scriptChecked = script;
553 return family; 553 return family;
554 } 554 }
555 555
556 } // namespace blink 556 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698