diff options
author | 2013-09-20 17:41:52 +0000 | |
---|---|---|
committer | 2013-09-20 17:41:52 +0000 | |
commit | c526c71acdb7c8d1af7bf284954bfcd768111405 (patch) | |
tree | 7772a27320c125031b1016ad4c2a70e01b6fbe9a | |
parent | dd88eccb22bd2cafcf0c0facf674a8aaaacca7fe (diff) |
Map Calibri to Carlito
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
-rw-r--r-- | src/ports/SkFontConfigInterface_direct.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index af704d0394..2c1e4188b9 100644 --- a/src/ports/SkFontConfigInterface_direct.cpp +++ b/src/ports/SkFontConfigInterface_direct.cpp @@ -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 = |