Add LayoutLocale class

third_party/WebKit/Source/platform/fonts/FontDescription.cpp

 /*
  * Copyright (C) 2007 Nicholas Shanks <contact@nickshanks.com>
  * Copyright (C) 2008 Apple 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 105 matching lines @@
     VariantLigatures ligatures;
 
     ligatures.common = commonLigaturesState();
     ligatures.discretionary = discretionaryLigaturesState();
     ligatures.historical = historicalLigaturesState();
     ligatures.contextual = contextualLigaturesState();
 
     return ligatures;
 }
 
-static const AtomicString& defaultLocale()
-{
-    DEFINE_STATIC_LOCAL(AtomicString, locale, ());
-    if (locale.isNull()) {
-        AtomicString defaultLocale = defaultLanguage();
-        if (!defaultLocale.isEmpty())
-            locale = defaultLocale;
-        else
-            locale = AtomicString("en");
-    }
-    return locale;
-}
-
-const AtomicString& FontDescription::locale(bool includeDefault) const
-{
-    if (m_locale.isNull() && includeDefault)
-        return defaultLocale();
-    return m_locale;
-}
-
 void FontDescription::setTraits(FontTraits traits)
 {
     setStyle(traits.style());
     setWeight(traits.weight());
     setStretch(traits.stretch());
 }
 
 void FontDescription::setVariantCaps(FontVariantCaps variantCaps)
 {
     m_fields.m_variantCaps = variantCaps;
@@ skipping 121 matching lines @@
     const FontFeatureSettings* settings = featureSettings();
     if (settings) {
         unsigned numFeatures = settings->size();
         for (unsigned i = 0; i < numFeatures; ++i) {
             const AtomicString& tag = settings->at(i).tag();
             for (unsigned j = 0; j < tag.length(); j++)
                 stringHasher.addCharacter(tag[j]);
             addToHash(hash, settings->at(i).value());
         }
     }
-    for (unsigned i = 0; i < m_locale.length(); i++)
-        stringHasher.addCharacter(m_locale[i]);
+    if (m_locale) {
+        const AtomicString& locale = m_locale->localeString();
+        for (unsigned i = 0; i < locale.length(); i++)
+            stringHasher.addCharacter(locale[i]);
+    }
     addToHash(hash, stringHasher.hash());
 
     addFloatToHash(hash, m_specifiedSize);
     addFloatToHash(hash, m_computedSize);
     addFloatToHash(hash, m_adjustedSize);
     addFloatToHash(hash, m_sizeAdjust);
     addFloatToHash(hash, m_letterSpacing);
     addFloatToHash(hash, m_wordSpacing);
     addToHash(hash, m_fieldsAsUnsigned.parts[0]);
     addToHash(hash, m_fieldsAsUnsigned.parts[1]);
@@ skipping 17 matching lines @@
         "FontStretchUltraCondensed should map to kUltraCondensed_Width");
     static_assert(
         static_cast<int>(FontStretchNormal) == static_cast<int>(SkFontStyle::kNormal_Width),
         "FontStretchNormal should map to kNormal_Width");
     static_assert(
         static_cast<int>(FontStretchUltraExpanded) == static_cast<int>(SkFontStyle::kUltaExpanded_Width),
         "FontStretchUltraExpanded should map to kUltaExpanded_Width");
 }
 
 } // namespace blink