Defer computing localeForHan until needed

third_party/WebKit/Source/platform/LayoutLocale.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "platform/LayoutLocale.h"
 
 #include "platform/Language.h"
+#include "platform/fonts/AcceptLanguagesResolver.h"
 #include "platform/text/LocaleToScriptMapping.h"
 #include "wtf/HashMap.h"
 #include "wtf/text/AtomicStringHash.h"
 #include "wtf/text/StringHash.h"
 
 #include <hb.h>
 #include <unicode/locid.h>
 
 namespace blink {
 
@@ skipping 74 matching lines @@
     if (m_scriptForHan == USCRIPT_COMMON)
         computeScriptForHan();
     return m_hasScriptForHan;
 }
 
 const LayoutLocale* LayoutLocale::localeForHan(const LayoutLocale* contentLocale)
 {
     if (contentLocale && contentLocale->hasScriptForHan())
         return contentLocale;
     if (!s_defaultForHanComputed)
-        setLocaleForHan(nullptr);
+        computeLocaleForHan();
     return s_defaultForHan;
 }
 
-void LayoutLocale::setLocaleForHan(const LayoutLocale* locale)
+void LayoutLocale::computeLocaleForHan()
 {
-    if (locale)
+    if (const LayoutLocale* locale = AcceptLanguagesResolver::localeForHan())
         s_defaultForHan = locale;
     else if (getDefault().hasScriptForHan())
         s_defaultForHan = &getDefault();
     else if (getSystem().hasScriptForHan())
         s_defaultForHan = &getSystem();
     else
         s_defaultForHan = nullptr;
     s_defaultForHanComputed = true;
 }
 
@@ skipping 80 matching lines @@
 }
 
 void LayoutLocale::setHyphenationForTesting(const AtomicString& localeString, PassRefPtr<Hyphenation> hyphenation)
 {
     const LayoutLocale& locale = valueOrDefault(get(localeString));
     locale.m_hyphenationComputed = true;
     locale.m_hyphenation = hyphenation;
 }
 
 } // namespace blink