diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 19:14:59 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-02 19:14:59 +0000 |
| commit | 10de41e5693ca0a24b42f4f971bd0d6ac0875b8b (patch) | |
| tree | 2106e7b311eddfd88ff554c9780d07f237f1f380 /skia | |
| parent | b261d0ea539baa5c3d997f0d98936fcaf319773c (diff) | |
| download | chromium_src-10de41e5693ca0a24b42f4f971bd0d6ac0875b8b.zip chromium_src-10de41e5693ca0a24b42f4f971bd0d6ac0875b8b.tar.gz chromium_src-10de41e5693ca0a24b42f4f971bd0d6ac0875b8b.tar.bz2 | |
Add additional aliases (Arimo, Tinos and Cousine) for Arial, Times New Roman,
and Courier New.
Arimo, Tinos and Cousine are the fonts to use on Chrome OS in place of the
above three fonts.
BUG=cros:5287 (http://crosbug.com/5287)
TEST=Make sure that you don't have Arial, Times New Roman and Courier New. Change /etc/fonts/conf.d/30-metric-aliases to include the 3 fonts above as aliases to Arial,TNR and Courier New. Go to a page specifying Arial, TNR and Courier New and see if they're rendered with Arimo, Tinos, and Cousine, instead.
Review URL: http://codereview.chromium.org/3089001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig_direct.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/skia/ext/SkFontHost_fontconfig_direct.cpp b/skia/ext/SkFontHost_fontconfig_direct.cpp index 7231bc2..15238bd 100644 --- a/skia/ext/SkFontHost_fontconfig_direct.cpp +++ b/skia/ext/SkFontHost_fontconfig_direct.cpp @@ -57,15 +57,20 @@ FontEquivClass GetFontEquivClass(const char* fontname) // much larger than Liberation. Note that Ascender Sans Mono // is metrically compatible with Courier New, but the former // is sans-serif while ther latter is serif. + // Arimo, Tinos and Cousine are the names of new fonts derived from and + // expanded upon Ascender Sans, Ascender Serif and Ascender Sans Mono. if (strcasecmp(fontname, "Arial") == 0 || strcasecmp(fontname, "Liberation Sans") == 0 || + strcasecmp(fontname, "Arimo") == 0 || strcasecmp(fontname, "Ascender Sans") == 0) { return SANS; } else if (strcasecmp(fontname, "Times New Roman") == 0 || strcasecmp(fontname, "Liberation Serif") == 0 || + strcasecmp(fontname, "Tinos") == 0 || strcasecmp(fontname, "Ascender Serif") == 0) { return SERIF; } else if (strcasecmp(fontname, "Courier New") == 0 || + strcasecmp(fontname, "Cousine") == 0 || strcasecmp(fontname, "Ascender Sans Mono") == 0) { return MONO; } |