Index: third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
diff --git a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
index 3a3dcacdbf6f9ab8841bc2aad0bff50c4b204f0d..7cb8c5cfac687d8444dd1c689a07e47a4fabcd5d 100644 |
--- a/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
+++ b/third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp |
@@ -86,13 +86,9 @@ AtomicString FontCache::getFamilyNameForCharacter(SkFontMgr* fm, UChar32 c, cons |
} |
if (const char* hanLocale = AcceptLanguagesResolver::preferredHanSkFontMgrLocale()) |
bcp47Locales[localeCount++] = hanLocale; |
- CString defaultLocale = toSkFontMgrLocale(defaultLanguage()); |
- bcp47Locales[localeCount++] = defaultLocale.data(); |
- CString fontLocale; |
- if (!fontDescription.locale().isEmpty()) { |
- fontLocale = toSkFontMgrLocale(fontDescription.locale()); |
- bcp47Locales[localeCount++] = fontLocale.data(); |
- } |
+ bcp47Locales[localeCount++] = LayoutLocale::getDefault().localeForSkFontMgr().data(); |
+ if (const LayoutLocale* locale = fontDescription.locale()) |
+ bcp47Locales[localeCount++] = locale->localeForSkFontMgr().data(); |
ASSERT_WITH_SECURITY_IMPLICATION(localeCount < kMaxLocales); |
RefPtr<SkTypeface> typeface = adoptRef(fm->matchFamilyStyleCharacter(0, SkFontStyle(), bcp47Locales, localeCount, c)); |
if (!typeface) |