commit 058e5c554084dd211541554f0708c86000a6e30e
author bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 20 17:41:52 2013 +0000
committer bungeman@google.com <bungeman@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Sep 20 17:41:52 2013 +0000
tree 7391581354a5f9d9f2ae8c8dcf6b24aa7fda3004
parent d599e74606c82cd84ae0bf2cc06f3f38d109c084

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/src@11418 2bbb7eff-a529-9590-31e7-b0007b416f81

ports/SkFontConfigInterface_direct.cpp

diff --git a/ports/SkFontConfigInterface_direct.cpp b/ports/SkFontConfigInterface_direct.cpp
index af704d0..2c1e418 100644
--- a/ports/SkFontConfigInterface_direct.cpp
+++ b/ports/SkFontConfigInterface_direct.cpp
@@ -172,6 +172,7 @@
     PMINGLIUHK,
     MINGLIUHK,
     CAMBRIA,
+    CALIBRI,
 };
 
 // Match the font name against a whilelist of fonts, returning the equivalence
@@ -284,6 +285,10 @@
         // Cambria
         { CAMBRIA, "Cambria" },
         { CAMBRIA, "Caladea" },
+
+        // Calibri
+        { CALIBRI, "Calibri" },
+        { CALIBRI, "Carlito" },
     };
 
     static const size_t kFontCount =