Add LayoutLocale class

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 5d6a886dedbbec51938aa31f58b96e84c61691d7..70e018ed8f6619a76b2dc9b24a767a25f525a16f 100644
--- a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
+++ b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp
@@ -126,8 +126,7 @@ PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(
     UScriptCode script;
     const wchar_t* family = getFallbackFamily(character,
         fontDescription.genericFamily(),
-        fontDescription.script(),
-        fontDescription.locale(),
+        fontDescription.localeOrDefault(),
         &script,
         fallbackPriority,
         m_fontManager.get());
@@ -145,8 +144,8 @@ PassRefPtr<SimpleFontData> FontCache::fallbackFontForCharacter(
         // fall back on the user's default locale.
         // TODO(kulshin): extract locale fallback logic from
         //   FontCacheAndroid.cpp and share that code
-        if (!fontDescription.locale().isEmpty()) {
-            fontLocale = toSkFontMgrLocale(fontDescription.locale());
+        if (fontDescription.locale()) {
+            fontLocale = fontDescription.locale()->localeForSkFontMgr();
             bcp47Locale = fontLocale.data();
             localeCount = 1;
         }