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

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

Issue 1839593002: Revert of Modernize Chinese system font fallback list for Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge TestExpectations Created 4 years, 8 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/TestExpectations ('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 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
187 static const UChar* oldSouthArabianFonts[] = { L"Segoe UI Historic", 0 }; 187 static const UChar* oldSouthArabianFonts[] = { L"Segoe UI Historic", 0 };
188 static const UChar* oriyaFonts[] = { L"Kalinga", L"ori1Uni", 188 static const UChar* oriyaFonts[] = { L"Kalinga", L"ori1Uni",
189 L"Lohit Oriya", L"Nirmala UI", 0 }; 189 L"Lohit Oriya", L"Nirmala UI", 0 };
190 static const UChar* orkhonFonts[] = { L"Segoe UI Historic", 190 static const UChar* orkhonFonts[] = { L"Segoe UI Historic",
191 L"Segoe UI Symbol", 0 }; 191 L"Segoe UI Symbol", 0 };
192 static const UChar* osmanyaFonts[] = { L"Ebrima", 0 }; 192 static const UChar* osmanyaFonts[] = { L"Ebrima", 0 };
193 static const UChar* phagsPaFonts[] = { L"Microsoft PhagsPa", 0 }; 193 static const UChar* phagsPaFonts[] = { L"Microsoft PhagsPa", 0 };
194 static const UChar* runicFonts[] = { L"Segoe UI Historic", 194 static const UChar* runicFonts[] = { L"Segoe UI Historic",
195 L"Segoe UI Symbol", 0 }; 195 L"Segoe UI Symbol", 0 };
196 static const UChar* shavianFonts[] = { L"Segoe UI Historic", 0 }; 196 static const UChar* shavianFonts[] = { L"Segoe UI Historic", 0 };
197 static const UChar* simplifiedHanFonts[] = { L"Microsoft YaHei", L"simsun", 197 static const UChar* simplifiedHanFonts[] = { L"simsun", L"Microsoft YaHei",
198 0 }; 198 0 };
199 static const UChar* sinhalaFonts[] = { L"Iskoola Pota", L"AksharUnicode", 199 static const UChar* sinhalaFonts[] = { L"Iskoola Pota", L"AksharUnicode",
200 L"Nirmala UI", 0 }; 200 L"Nirmala UI", 0 };
201 static const UChar* soraSompengFonts[] = { L"Nirmala UI", 0 }; 201 static const UChar* soraSompengFonts[] = { L"Nirmala UI", 0 };
202 static const UChar* symbolsFonts[] = { L"Segoe UI Symbol", 0 }; 202 static const UChar* symbolsFonts[] = { L"Segoe UI Symbol", 0 };
203 static const UChar* syriacFonts[] = { L"Estrangelo Edessa", 203 static const UChar* syriacFonts[] = { L"Estrangelo Edessa",
204 L"Estrangelo Nisibin", L"Code2000", 0 }; 204 L"Estrangelo Nisibin", L"Code2000", 0 };
205 static const UChar* taiLeFonts[] = { L"Microsoft Tai Le", 0 }; 205 static const UChar* taiLeFonts[] = { L"Microsoft Tai Le", 0 };
206 static const UChar* tamilFonts[] = { L"Nirmala UI", L"Latha", 0 }; 206 static const UChar* tamilFonts[] = { L"Nirmala UI", L"Latha", 0 };
207 static const UChar* teluguFonts[] = { L"Nirmala UI", L"Gautami", 0 }; 207 static const UChar* teluguFonts[] = { L"Nirmala UI", L"Gautami", 0 };
208 static const UChar* thaanaFonts[] = { L"MV Boli", 0 }; 208 static const UChar* thaanaFonts[] = { L"MV Boli", 0 };
209 static const UChar* thaiFonts[] = { L"Tahoma", L"Leelawadee UI", 209 static const UChar* thaiFonts[] = { L"Tahoma", L"Leelawadee UI",
210 L"Leelawadee", 0 }; 210 L"Leelawadee", 0 };
211 static const UChar* tibetanFonts[] = { L"Microsoft Himalaya", L"Jomolhari", 211 static const UChar* tibetanFonts[] = { L"Microsoft Himalaya", L"Jomolhari",
212 L"Tibetan Machine Uni", 0 }; 212 L"Tibetan Machine Uni", 0 };
213 static const UChar* tifinaghFonts[] = { L"Ebrima", 0 }; 213 static const UChar* tifinaghFonts[] = { L"Ebrima", 0 };
214 static const UChar* traditionalHanFonts[] = { L"Microsoft JhengHei", 214 static const UChar* traditionalHanFonts[] = { L"pmingliu",
215 L"pmingliu", 0 }; 215 L"Microsoft JhengHei", 0 };
216 static const UChar* vaiFonts[] = { L"Ebrima", 0 }; 216 static const UChar* vaiFonts[] = { L"Ebrima", 0 };
217 static const UChar* yiFonts[] = { L"Microsoft Yi Baiti", L"Nuosu SIL", 217 static const UChar* yiFonts[] = { L"Microsoft Yi Baiti", L"Nuosu SIL",
218 L"Code2000", 0 }; 218 L"Code2000", 0 };
219 219
220 static const ScriptToFontFamilies scriptToFontFamilies[] = { 220 static const ScriptToFontFamilies scriptToFontFamilies[] = {
221 { USCRIPT_ARABIC, arabicFonts }, 221 { USCRIPT_ARABIC, arabicFonts },
222 { USCRIPT_ARMENIAN, armenianFonts }, 222 { USCRIPT_ARMENIAN, armenianFonts },
223 { USCRIPT_BENGALI, bengaliFonts }, 223 { USCRIPT_BENGALI, bengaliFonts },
224 { USCRIPT_BRAHMI, brahmiFonts }, 224 { USCRIPT_BRAHMI, brahmiFonts },
225 { USCRIPT_BRAILLE, brailleFonts }, 225 { USCRIPT_BRAILLE, brailleFonts },
(...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after
545 family = L"lucida sans unicode"; 545 family = L"lucida sans unicode";
546 } 546 }
547 } 547 }
548 548
549 if (scriptChecked) 549 if (scriptChecked)
550 *scriptChecked = script; 550 *scriptChecked = script;
551 return family; 551 return family;
552 } 552 }
553 553
554 } // namespace blink 554 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/LayoutTests/TestExpectations ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698