AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Map Calibri to Carlito

Browse Source 
Chrome OS will have Carlito as a metric-compatible replacement for Calibri.

This change has to be combined with a Chrome OS change to add
Calibri and configure fontconfig accordingly.

BUG=280557
TEST=With the CrOS change, a page using Calibri will use Carlito instead of the default fallback font (Arimo in case of English UI).
R=bungeman@google.com

Review URL: https://codereview.chromium.org/23618061

git-svn-id: http://skia.googlecode.com/svn/trunk@11418 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
bungeman@google.com 2013-09-20 17:41:52 +00:00
parent dd88eccb22
commit c526c71acd
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ports/SkFontConfigInterface_direct.cpp
View File

@ -172,6 +172,7 @@ enum FontEquivClass
PMINGLIUHK,
MINGLIUHK,
CAMBRIA,
CALIBRI,
};
// Match the font name against a whilelist of fonts, returning the equivalence
@ -284,6 +285,10 @@ FontEquivClass GetFontEquivClass(const char* fontname)
// Cambria
{ CAMBRIA, "Cambria" },
{ CAMBRIA, "Caladea" },
// Calibri
{ CALIBRI, "Calibri" },
{ CALIBRI, "Carlito" },
};
static const size_t kFontCount =