From c4de77610191074250dca0bfc21c574eb2d0921c Mon Sep 17 00:00:00 2001
From: "commit-bot@chromium.org"
 <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81>
Date: Wed, 20 Mar 2013 13:33:33 +0000
Subject: [PATCH] Add an entry for Cambria-Caladea to the list of metric
 compatible fonts.

Caladea is going to be included in Chromium/Chrome OS as a substitute for Cambria. (see https://gerrit.chromium.org/gerrit/#/c/45888/ ).


BUG=chromium:168879
TEST=See the bug and the ChromeOS CL above.

Author: jshin@chromium.org

Reviewed By: reed@google.com

Review URL: https://chromiumcodereview.appspot.com/12879008

git-svn-id: http://skia.googlecode.com/svn/trunk@8251 2bbb7eff-a529-9590-31e7-b0007b416f81
---
 src/ports/SkFontConfigInterface_direct.cpp | 37 ++++++++++++----------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
index 00ffe7943b..29cb49b9d1 100644
--- a/src/ports/SkFontConfigInterface_direct.cpp
+++ b/src/ports/SkFontConfigInterface_direct.cpp
@@ -63,6 +63,7 @@ enum FontEquivClass
     MINGLIU,
     PMINGLIUHK,
     MINGLIUHK,
+    CAMBRIA,
 };
 
 // Match the font name against a whilelist of fonts, returning the equivalence
@@ -152,25 +153,29 @@ FontEquivClass GetFontEquivClass(const char* fontname)
         { SIMHEI, "MYingHeiGB18030" },
         { SIMHEI, "MYingHeiB5HK" },
 
-    // 新細明體
-    { PMINGLIU, "PMingLiU"},
-    { PMINGLIU, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
-    { PMINGLIU, "MSung B5HK"},
+        // 新細明體
+        { PMINGLIU, "PMingLiU"},
+        { PMINGLIU, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
+        { PMINGLIU, "MSung B5HK"},
 
-    // 細明體
-    { MINGLIU, "MingLiU"},
-    { MINGLIU, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
-    { MINGLIU, "MSung B5HK"},
+        // 細明體
+        { MINGLIU, "MingLiU"},
+        { MINGLIU, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94" },
+        { MINGLIU, "MSung B5HK"},
 
-    // 新細明體
-    { PMINGLIUHK, "PMingLiU_HKSCS"},
-    { PMINGLIUHK, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
-    { PMINGLIUHK, "MSung B5HK"},
+        // 新細明體
+        { PMINGLIUHK, "PMingLiU_HKSCS"},
+        { PMINGLIUHK, "\xe6\x96\xb0\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
+        { PMINGLIUHK, "MSung B5HK"},
 
-    // 細明體
-    { MINGLIUHK, "MingLiU_HKSCS"},
-    { MINGLIUHK, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
-    { MINGLIUHK, "MSung B5HK"},
+        // 細明體
+        { MINGLIUHK, "MingLiU_HKSCS"},
+        { MINGLIUHK, "\xe7\xb4\xb0\xe6\x98\x8e\xe9\xab\x94_HKSCS" },
+        { MINGLIUHK, "MSung B5HK"},
+
+        // Cambria
+        { CAMBRIA, "Cambria" },
+        { CAMBRIA, "Caladea" },
     };
 
     static const size_t kFontCount =