Map Calibri to Carlito

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).

[jungshik at Google, 2013-09-17 17:16:12]

Hello, 

Can you review this simple change? Chrome OS is getting a Carlito as a
metric-compatible replacement for Calibri. 

Thanks,

[Daniel Erat, 2013-09-17 17:32:12]

lgtm

[bungeman-skia, 2013-09-19 15:22:23]

lgtm

In the longer term we're trying to move this list out of here, but I suppose
it's here for now.

Also, in the future you'll want to send reviews to bungeman1, I almost missed
this review because bungeman doesn't get checked very often at the moment (at
least for code reviews).

[commit-bot: I haz the power, 2013-09-19 16:05:09]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/jshin@chromium.org/23447033/1

[jungshik at Google, 2013-09-19 16:06:12]

Thanks for LGTMs. I'm checking CQ hoping that it works for Skia tree even though
I don't have a commit priv. there. 
I'll make sure to use the correct account in the future.

[commit-bot: I haz the power, 2013-09-19 16:08:22]

Retried try job too often on Build-Mac10.7-Clang-x86-Release-Trybot for step(s)
BuildBench, BuildEverything, BuildGm, BuildSkiaLib, BuildTests, BuildTools
http://173.255.115.253:10117/buildstatus?builder=Build-Mac10.7-Clang-x86-Rele...

[bungeman-skia, 2013-09-19 16:20:21]

On 2013/09/19 16:08:22, I haz the power (commit-bot) wrote:
> Retried try job too often on Build-Mac10.7-Clang-x86-Release-Trybot for
step(s)
> BuildBench, BuildEverything, BuildGm, BuildSkiaLib, BuildTests, BuildTools
>
http://173.255.115.253:10117/buildstatus?builder=Build-Mac10.7-Clang-x86-Rele...

Looks like you have a base url of http://skia.googlecode.com/svn/trunk/src/ and
the bots expect http://skia.googlecode.com/svn/trunk/ .

[jungshik at Google, 2013-09-19 19:41:03]

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).

[commit-bot: I haz the power, 2013-09-19 19:42:48]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/jshin@chromium.org/23447033/16001

[commit-bot: I haz the power, 2013-09-19 19:42:50]

Failed to apply patch for src/src/ports/SkFontConfigInterface_direct.cpp:
While running patch -p0 --forward --force --no-backup-if-mismatch;
  A         src/src
  Created missing directory src/src.
  A         src/src/ports
  Created missing directory src/src/ports.
  can't find file to patch at input line 5
  Perhaps you used the wrong -p or --strip option?
  The text leading up to this was:
  --------------------------
  |Index: src/ports/SkFontConfigInterface_direct.cpp
  |===================================================================
  |--- src/src/ports/SkFontConfigInterface_direct.cpp	(revision 11397)
  |+++ src/src/ports/SkFontConfigInterface_direct.cpp	(working copy)
  --------------------------
  No file to patch.  Skipping patch.
  2 out of 2 hunks ignored

Patch:       src/src/ports/SkFontConfigInterface_direct.cpp
Index: src/ports/SkFontConfigInterface_direct.cpp
===================================================================
--- src/src/ports/SkFontConfigInterface_direct.cpp	(revision 11397)
+++ src/src/ports/SkFontConfigInterface_direct.cpp	(working copy)
@@ -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 =

[jungshik at Google, 2013-09-19 20:11:00]

I've made a separate check-out of Skia outside Chromium tree and made a new CL
at https://codereview.chromium.org/23618061/.  Can you lgtm it, instead?

Thanks. 

My attempt to use this CL with a patchset made in the new tree  (I uploaded it
with '--issue xxxx' option) didn't work.