Index: content/browser/renderer_host/font_utils_linux.cc |
diff --git a/content/browser/renderer_host/font_utils_linux.cc b/content/browser/renderer_host/font_utils_linux.cc |
index 715923d6b88259a7634cc9344e75c1b85784c612..245475f665032d6560ba697e7de384c68dc8785d 100644 |
--- a/content/browser/renderer_host/font_utils_linux.cc |
+++ b/content/browser/renderer_host/font_utils_linux.cc |
@@ -12,8 +12,8 @@ |
#include <string> |
#include "base/posix/eintr_wrapper.h" |
+#include "ppapi/c/private/pp_private_font_charset.h" |
#include "ppapi/c/trusted/ppb_browser_font_trusted.h" |
-#include "third_party/npapi/bindings/npapi_extensions.h" |
namespace { |
@@ -41,30 +41,30 @@ bool MSCharSetToFontconfig(FcLangSet* langset, unsigned fdwCharSet) { |
bool is_lgc = false; |
switch (fdwCharSet) { |
- case NPCharsetAnsi: |
+ case PP_PRIVATEFONTCHARSET_ANSI: |
// These values I don't really know what to do with, so I'm going to map |
// them to English also. |
- case NPCharsetDefault: |
- case NPCharsetMac: |
- case NPCharsetOEM: |
- case NPCharsetSymbol: |
+ case PP_PRIVATEFONTCHARSET_DEFAULT: |
+ case PP_PRIVATEFONTCHARSET_MAC: |
+ case PP_PRIVATEFONTCHARSET_OEM: |
+ case PP_PRIVATEFONTCHARSET_SYMBOL: |
is_lgc = true; |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("en")); |
break; |
- case NPCharsetBaltic: |
+ case PP_PRIVATEFONTCHARSET_BALTIC: |
// The three baltic languages. |
is_lgc = true; |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("et")); |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("lv")); |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("lt")); |
break; |
- case NPCharsetChineseBIG5: |
+ case PP_PRIVATEFONTCHARSET_CHINESEBIG5: |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("zh-tw")); |
break; |
- case NPCharsetGB2312: |
+ case PP_PRIVATEFONTCHARSET_GB2312: |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("zh-cn")); |
break; |
- case NPCharsetEastEurope: |
+ case PP_PRIVATEFONTCHARSET_EASTEUROPE: |
// A scattering of eastern European languages. |
is_lgc = true; |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("pl")); |
@@ -73,38 +73,38 @@ bool MSCharSetToFontconfig(FcLangSet* langset, unsigned fdwCharSet) { |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("hu")); |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("hr")); |
break; |
- case NPCharsetGreek: |
+ case PP_PRIVATEFONTCHARSET_GREEK: |
is_lgc = true; |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("el")); |
break; |
- case NPCharsetHangul: |
- case NPCharsetJohab: |
+ case PP_PRIVATEFONTCHARSET_HANGUL: |
+ case PP_PRIVATEFONTCHARSET_JOHAB: |
// Korean |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("ko")); |
break; |
- case NPCharsetRussian: |
+ case PP_PRIVATEFONTCHARSET_RUSSIAN: |
is_lgc = true; |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("ru")); |
break; |
- case NPCharsetShiftJIS: |
+ case PP_PRIVATEFONTCHARSET_SHIFTJIS: |
// Japanese |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("ja")); |
break; |
- case NPCharsetTurkish: |
+ case PP_PRIVATEFONTCHARSET_TURKISH: |
is_lgc = true; |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("tr")); |
break; |
- case NPCharsetVietnamese: |
+ case PP_PRIVATEFONTCHARSET_VIETNAMESE: |
is_lgc = true; |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("vi")); |
break; |
- case NPCharsetArabic: |
+ case PP_PRIVATEFONTCHARSET_ARABIC: |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("ar")); |
break; |
- case NPCharsetHebrew: |
+ case PP_PRIVATEFONTCHARSET_HEBREW: |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("he")); |
break; |
- case NPCharsetThai: |
+ case PP_PRIVATEFONTCHARSET_THAI: |
FcLangSetAdd(langset, reinterpret_cast<const FcChar8*>("th")); |
break; |
// default: |