Fallback on system locale for font selection

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 11 matching lines @@
  * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "platform/fonts/FontDescription.h"
 
+#include "platform/Language.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "wtf/StringHasher.h"
 #include "wtf/text/AtomicStringHash.h"
 #include "wtf/text/StringHash.h"
 
 namespace blink {
 
 struct SameSizeAsFontDescription {
     DISALLOW_NEW();
     FontFamily familyList;
@@ skipping 76 matching lines @@
     ligatures.discretionary = discretionaryLigaturesState();
     ligatures.historical = historicalLigaturesState();
     ligatures.contextual = contextualLigaturesState();
 
     return ligatures;
 }
 
 static const AtomicString& defaultLocale()
 {
     DEFINE_STATIC_LOCAL(AtomicString, locale, ());
-    if (locale.isNull())
-        locale = AtomicString("en");
+    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;
 }
 
@@ skipping 132 matching lines @@
     addFloatToHash(hash, m_sizeAdjust);
     addFloatToHash(hash, m_letterSpacing);
     addFloatToHash(hash, m_wordSpacing);
     addToHash(hash, m_fieldsAsUnsigned[0]);
     addToHash(hash, m_fieldsAsUnsigned[1]);
 
     return hash;
 }
 
 } // namespace blink