From 7476cf533be14b84e83de1bf30db7eef889c1f23 Mon Sep 17 00:00:00 2001 From: jshin Date: Tue, 9 Sep 2014 12:30:57 -0700 Subject: [PATCH] Update the alias mapping for Noto Sans CJK. To make the family names 'future-proof', we decided to shorten the name of Noto Sans CJK, which requires a change in the alias table in Skia. Chrome OS CL (actually updating the fonts) and Chrome CL (updating the font preferences on CrOS) are going together with this CL. BUG=412151 TEST=With the above two CLs in on Chrome OS, Noto Sans CJK {JP, SC} are used when MS P Gothic / Simhei are asked for by a web page. R=bungeman@google.com Author: jshin@chromium.org Review URL: https://codereview.chromium.org/554943002 --- src/ports/SkFontConfigInterface_direct.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index 6fff03bb7a..039d8689ee 100644 --- a/src/ports/SkFontConfigInterface_direct.cpp +++ b/src/ports/SkFontConfigInterface_direct.cpp @@ -221,7 +221,7 @@ FontEquivClass GetFontEquivClass(const char* fontname) { PGOTHIC, "MS PGothic" }, { PGOTHIC, "\xef\xbc\xad\xef\xbc\xb3 \xef\xbc\xb0" "\xe3\x82\xb4\xe3\x82\xb7\xe3\x83\x83\xe3\x82\xaf" }, - { PGOTHIC, "Noto Sans CJK Japanese" }, + { PGOTHIC, "Noto Sans CJK JP" }, { PGOTHIC, "IPAPGothic" }, { PGOTHIC, "MotoyaG04Gothic" }, @@ -260,7 +260,7 @@ FontEquivClass GetFontEquivClass(const char* fontname) // 黑体 { SIMHEI, "Simhei" }, { SIMHEI, "\xe9\xbb\x91\xe4\xbd\x93" }, - { SIMHEI, "Noto Sans CJK Simplified Chinese" }, + { SIMHEI, "Noto Sans CJK SC" }, { SIMHEI, "MYingHeiGB18030" }, { SIMHEI, "MYingHeiB5HK" },