Fix scriptCodeForHanFromSubtags() may return non-Han scripts

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/text/LocaleToScriptMapping.h"
 #include "wtf/HashMap.h"
 #include "wtf/text/AtomicStringHash.h"
@@ skipping 36 matching lines @@
 const char* LayoutLocale::localeForSkFontMgr() const
 {
     if (m_stringForSkFontMgr.isNull()) {
         m_stringForSkFontMgr = toSkFontMgrLocale(m_script);
         if (m_stringForSkFontMgr.isNull())
             m_stringForSkFontMgr = m_string.ascii();
     }
     return m_stringForSkFontMgr.data();
 }
 
-static bool isUnambiguousHanScript(UScriptCode script)
-{
-    // localeToScriptCodeForFontSelection() does not return these values.
-    DCHECK(script != USCRIPT_HIRAGANA && script != USCRIPT_KATAKANA);
-    return script == USCRIPT_KATAKANA_OR_HIRAGANA
-        || script == USCRIPT_SIMPLIFIED_HAN
-        || script == USCRIPT_TRADITIONAL_HAN
-        || script == USCRIPT_HANGUL;
-}
-
 void LayoutLocale::computeScriptForHan() const
 {
     if (isUnambiguousHanScript(m_script)) {
         m_scriptForHan = m_script;
         m_hasScriptForHan = true;
         return;
     }
 
     m_scriptForHan = scriptCodeForHanFromSubtags(m_string);
     if (m_scriptForHan == USCRIPT_COMMON)
@@ skipping 122 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