Add LayoutLocale class

third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp

 /*
  * Copyright (c) 2006, 2007, 2008, 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 68 matching lines @@
 
     const size_t kMaxLocales = 4;
     const char* bcp47Locales[kMaxLocales];
     size_t localeCount = 0;
 
     if (fallbackPriority == FontFallbackPriority::EmojiEmoji) {
         bcp47Locales[localeCount++] = kAndroidColorEmojiLocale;
     }
     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)
         return emptyAtom;
 
     SkString skiaFamilyName;
     typeface->getFamilyName(&skiaFamilyName);
     return skiaFamilyName.c_str();
 }
 #endif
@@ skipping 108 matching lines @@
     return wrapUnique(new FontPlatformData(tf,
         name.data(),
         fontSize,
         (fontDescription.weight() > 200 + tf->fontStyle().weight()) || fontDescription.isSyntheticBold(),
         ((fontDescription.style() == FontStyleItalic || fontDescription.style() == FontStyleOblique) && !tf->isItalic()) || fontDescription.isSyntheticItalic(),
         fontDescription.orientation()));
 }
 #endif // !OS(WIN)
 
 } // namespace blink