More LayoutLocale refactor with additional Chinese support

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

 /*
  * Copyright (C) 2006, 2007 Apple Computer, Inc.
  * Copyright (c) 2006, 2007, 2008, 2009, 2012 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.
@@ skipping 108 matching lines @@
         || fontDescription.weight() >= FontWeightBold)) {
         RefPtr<SimpleFontData> fontData = fallbackOnStandardFontStyle(
             fontDescription, character);
         if (fontData)
             return fontData;
     }
 
     UScriptCode script;
     const wchar_t* family = getFallbackFamily(character,
         fontDescription.genericFamily(),
-        fontDescription.localeOrDefault(),
+        fontDescription.locale(),
         &script,
         fallbackPriority,
         m_fontManager.get());
     FontPlatformData* data = 0;
     if (family) {
         FontFaceCreationParams createByFamily(AtomicString(family, wcslen(family)));
         data = getFontPlatformData(fontDescription, createByFamily);
     }
 
     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;
         }
 
         CString familyName = fontDescription.family().family().utf8();
 
         SkTypeface* typeface = m_fontManager->matchFamilyStyleCharacter(
             familyName.data(),
             fontDescription.skiaFontStyle(),
             &bcp47Locale,
             localeCount,
@@ skipping 286 matching lines @@
         if (typefacesMatchesFamily(tf.get(), family)) {
             result->setMinSizeForSubpixel(minSizeForSubpixelForFont);
             break;
         }
     }
 
     return result;
 }
 
 } // namespace blink