| Index: third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
|
| diff --git a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
|
| index 4a5521003683722aebd3769c2c024ad48bd1d514..3a486da1fcffc9d8cecbcd5eb1d9e2b428e48dc2 100644
|
| --- a/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
|
| +++ b/third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp
|
| @@ -41,23 +41,6 @@
|
|
|
| namespace blink {
|
|
|
| -// SkFontMgr requires script-based locale names, like "zh-Hant" and "zh-Hans",
|
| -// instead of "zh-CN" and "zh-TW".
|
| -static CString toSkFontMgrLocale(const String& locale)
|
| -{
|
| - if (!locale.startsWith("zh", TextCaseInsensitive))
|
| - return locale.ascii();
|
| -
|
| - switch (localeToScriptCodeForFontSelection(locale)) {
|
| - case USCRIPT_SIMPLIFIED_HAN:
|
| - return "zh-Hans";
|
| - case USCRIPT_TRADITIONAL_HAN:
|
| - return "zh-Hant";
|
| - default:
|
| - return locale.ascii();
|
| - }
|
| -}
|
| -
|
| static AtomicString getFamilyNameForCharacter(UChar32 c, const FontDescription& fontDescription)
|
| {
|
| RefPtr<SkFontMgr> fm = adoptRef(SkFontMgr::RefDefault());
|
|
|