More LayoutLocale refactor with additional Chinese support

third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

Index: third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
diff --git a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
index 70e018ed8f6619a76b2dc9b24a767a25f525a16f..b8e6238cdda2c31b1fc4e6ba22e5a1bdfcfa4aeb 100644
--- a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
+++ b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
@@ -126,7 +126,7 @@ PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(
     UScriptCode script;
     const wchar_t* family = getFallbackFamily(character,
         fontDescription.genericFamily(),
-        fontDescription.localeOrDefault(),
+        fontDescription.locale(),
         &script,
         fallbackPriority,
         m_fontManager.get());
@@ -139,14 +139,12 @@ PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(
     if ((!data || !data->fontContainsCharacter(character)) && s_useSkiaFontFallback) {
         const char* bcp47Locale = nullptr;
         int localeCount = 0;
-        CString fontLocale;
         // If the font description has a locale, use that. Otherwise, Skia will
         // fall back on the user's default locale.
         // TODO(kulshin): extract locale fallback logic from
         //   FontCacheAndroid.cpp and share that code
         if (fontDescription.locale()) {
-            fontLocale = fontDescription.locale()->localeForSkFontMgr();
-            bcp47Locale = fontLocale.data();
+            bcp47Locale = fontDescription.locale()->localeForSkFontMgr();
             localeCount = 1;
         }