diff options
| author | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 03:43:08 +0000 |
|---|---|---|
| committer | kochi@chromium.org <kochi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-09 03:43:08 +0000 |
| commit | d5711eb7cbe2a03e9a0b55bf81746861035a47b5 (patch) | |
| tree | fcc88af246a461933e792ed1d8ce11bb6b66d3eb /skia | |
| parent | b301f5e8c9f64d1b9bdec6c709ec0038c60406d8 (diff) | |
| download | chromium_src-d5711eb7cbe2a03e9a0b55bf81746861035a47b5.zip chromium_src-d5711eb7cbe2a03e9a0b55bf81746861035a47b5.tar.gz chromium_src-d5711eb7cbe2a03e9a0b55bf81746861035a47b5.tar.bz2 | |
Intoroducing Motoya font for ChromeOS
This is a retry of r120926, which was reverted. The error was due to
duplicate entry in the translation resource file, which only happens
on 'Official' build.
We will introduce Motoya fonts (MotoyaG04Gothic, MotoyaG04Mincho)
as the default Japanese font for ChromeOS. This CL is for preparing
resource to define default font and Skia to check the font family
is compatible with their counterparts of MS Windows fonts.
Note that GTK font specification in the resource does not
handle multiple fonts (e.g. "MotoyaG04Gothic 10, IPAPGothic 10")
and I left it as is (see crosbug.com/17382 for details).
Fontconfig should cover the compatibility check
(IPAPGothic => MotoyaG04Gothic) and display the proper font.
BUG=chromium-os:16690
TEST=build, run and see Japanese fonts are properly displayed in both web contents and Chrome UI.
Review URL: http://codereview.chromium.org/9365012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@121170 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig_direct.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/skia/ext/SkFontHost_fontconfig_direct.cpp b/skia/ext/SkFontHost_fontconfig_direct.cpp index 18a6863..dd48a6e 100644 --- a/skia/ext/SkFontHost_fontconfig_direct.cpp +++ b/skia/ext/SkFontHost_fontconfig_direct.cpp @@ -88,6 +88,7 @@ FontEquivClass GetFontEquivClass(const char* fontname) { PGOTHIC, "\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0" "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" }, { PGOTHIC, "IPAPGothic" }, + { PGOTHIC, "MotoyaG04Gothic" }, // 宋体 { SIMSUN, "Simsun" }, @@ -99,17 +100,20 @@ FontEquivClass GetFontEquivClass(const char* fontname) { PMINCHO, "\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0" "\xe6\x98\x8e\xe6\x9c\x9d"}, { PMINCHO, "IPAPMincho" }, + { PMINCHO, "MotoyaG04Mincho" }, // ＭＳ ゴシック { GOTHIC, "MS Gothic" }, { GOTHIC, "\xef\xbc\xad\xef\xbc\xb3 " "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" }, { GOTHIC, "IPAGothic" }, + { GOTHIC, "MotoyaG04GothicMono" }, // ＭＳ 明朝 { MINCHO, "MS Mincho" }, { MINCHO, "\xef\xbc\xad\xef\xbc\xb3 \xe6\x98\x8e\xe6\x9c\x9d" }, { MINCHO, "IPAMincho" }, + { MINCHO, "MotoyaG04MinchoMono" }, // 新宋体 { NSIMSUN, "NSimsun" }, |