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

Side by Side Diff: src/ports/SkFontConfigInterface_direct.cpp

Issue 1134853002: Make Noto Sans Mono CJK JP an alias to MS Gothic (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 5 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 | « 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 2009 Google Inc. 2 * Copyright 2009 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */ 8 /* migrated from chrome/src/skia/ext/SkFontHost_fontconfig_direct.cpp */
9 9
10 #include <unistd.h> 10 #include <unistd.h>
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 { PGOTHIC, "\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0" 222 { PGOTHIC, "\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0"
223 "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" }, 223 "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" },
224 { PGOTHIC, "Noto Sans CJK JP" }, 224 { PGOTHIC, "Noto Sans CJK JP" },
225 { PGOTHIC, "IPAPGothic" }, 225 { PGOTHIC, "IPAPGothic" },
226 { PGOTHIC, "MotoyaG04Gothic" }, 226 { PGOTHIC, "MotoyaG04Gothic" },
227 227
228 // MS ゴシック 228 // MS ゴシック
229 { GOTHIC, "MS Gothic" }, 229 { GOTHIC, "MS Gothic" },
230 { GOTHIC, "\xef\xbc\xad\xef\xbc\xb3 " 230 { GOTHIC, "\xef\xbc\xad\xef\xbc\xb3 "
231 "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" }, 231 "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" },
232 { GOTHIC, "Noto Sans Mono CJK JP" },
232 { GOTHIC, "IPAGothic" }, 233 { GOTHIC, "IPAGothic" },
233 { GOTHIC, "MotoyaG04GothicMono" }, 234 { GOTHIC, "MotoyaG04GothicMono" },
234 235
235 // MS P明朝 236 // MS P明朝
236 { PMINCHO, "MS PMincho" }, 237 { PMINCHO, "MS PMincho" },
237 { PMINCHO, "\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0" 238 { PMINCHO, "\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0"
238 "\xe6\x98\x8e\xe6\x9c\x9d"}, 239 "\xe6\x98\x8e\xe6\x9c\x9d"},
239 { PMINCHO, "IPAPMincho" }, 240 { PMINCHO, "IPAPMincho" },
240 { PMINCHO, "MotoyaG04Mincho" }, 241 { PMINCHO, "MotoyaG04Mincho" },
241 242
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after
726 *trimmedMatches.append() = match[i]; 727 *trimmedMatches.append() = match[i];
727 } 728 }
728 } 729 }
729 730
730 SkFontStyleSet_FC* sset = SkNEW_ARGS(SkFontStyleSet_FC, 731 SkFontStyleSet_FC* sset = SkNEW_ARGS(SkFontStyleSet_FC,
731 (trimmedMatches.begin(), 732 (trimmedMatches.begin(),
732 trimmedMatches.count())); 733 trimmedMatches.count()));
733 #endif 734 #endif
734 return false; 735 return false;
735 } 736 }
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