third_party/WebKit/Source/platform/fonts/win/FontFallbackWin.cpp - Issue 1964063002: Fix Georgian font selection on Windows 7

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

Issue 1964063002: Fix Georgian font selection on Windows 7 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2661

Patch Set: Created 4 years, 7 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 »

OLD	NEW
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 124 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
135 static const UChar* copticFonts[] = { L"Segoe UI Symbol", 0 };	135 static const UChar* copticFonts[] = { L"Segoe UI Symbol", 0 };

136 static const UChar* cuneiformFonts[] = { L"Segoe UI Historic", 0 };	136 static const UChar* cuneiformFonts[] = { L"Segoe UI Historic", 0 };

137 static const UChar* cypriotFonts[] = { L"Segoe UI Historic", 0 };	137 static const UChar* cypriotFonts[] = { L"Segoe UI Historic", 0 };

138 static const UChar* deseretFonts[] = { L"Segoe UI Symbol", 0 };	138 static const UChar* deseretFonts[] = { L"Segoe UI Symbol", 0 };

139 static const UChar* devanagariFonts[] = { L"Nirmala UI", L"Mangal", 0 };	139 static const UChar* devanagariFonts[] = { L"Nirmala UI", L"Mangal", 0 };

140 static const UChar* egyptianHieroglyphsFonts[] = { L"Segoe UI Historic",	140 static const UChar* egyptianHieroglyphsFonts[] = { L"Segoe UI Historic",

141 0 };	141 0 };

142 static const UChar* ethiopicFonts[] = { L"Nyala", L"Abyssinica SIL",	142 static const UChar* ethiopicFonts[] = { L"Nyala", L"Abyssinica SIL",

143 L"Ethiopia Jiret", L"Visual Geez Unicode", L"GF Zemen Unicode",	143 L"Ethiopia Jiret", L"Visual Geez Unicode", L"GF Zemen Unicode",

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"Sylfaen", L"Segoe UI", 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"MS PGothic", L"Yu Gothic",

155 L"Microsoft YaHei", 0 };	155 L"Microsoft YaHei", 0 };

(...skipping 391 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
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

OLD	NEW