Make calls to AtomicString(const String&) explicit in html/

Source/platform/Language.cpp

 /*
  * Copyright (C) 2010, 2013 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.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 13 matching lines @@
  */
 
 #include "config.h"
 #include "platform/Language.h"
 
 #include "public/platform/Platform.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
-static String platformLanguage()
+static const AtomicString& platformLanguage()
 {
-    DEFINE_STATIC_LOCAL(String, computedDefaultLanguage, ());
+    DEFINE_STATIC_LOCAL(AtomicString, computedDefaultLanguage, ());
     if (computedDefaultLanguage.isEmpty()) {
-        computedDefaultLanguage.append(blink::Platform::current()->defaultLocale());
+        computedDefaultLanguage = blink::Platform::current()->defaultLocale();
         ASSERT(!computedDefaultLanguage.isEmpty());
     }
     return computedDefaultLanguage;
 }
 
-String defaultLanguage()
+AtomicString defaultLanguage()
 {
-    Vector<String> languages = userPreferredLanguages();
-    if (languages.size())
+    Vector<AtomicString> languages = userPreferredLanguages();
+    if (!languages.isEmpty())
         return languages[0];
 
-    return emptyString();
+    return emptyAtom;
 }
 
-static Vector<String>& preferredLanguagesOverride()
+static Vector<AtomicString>& preferredLanguagesOverride()
 {
-    DEFINE_STATIC_LOCAL(Vector<String>, override, ());
+    DEFINE_STATIC_LOCAL(Vector<AtomicString>, override, ());
     return override;
 }
 
-Vector<String> userPreferredLanguagesOverride()
+Vector<AtomicString> userPreferredLanguagesOverride()
 {
     return preferredLanguagesOverride();
 }
 
-void overrideUserPreferredLanguages(const Vector<String>& override)
+void overrideUserPreferredLanguages(const Vector<AtomicString>& override)
 {
     preferredLanguagesOverride() = override;
 }
 
-Vector<String> userPreferredLanguages()
+Vector<AtomicString> userPreferredLanguages()
 {
-    Vector<String>& override = preferredLanguagesOverride();
+    Vector<AtomicString>& override = preferredLanguagesOverride();
     if (!override.isEmpty())
         return override;
 
-    Vector<String> languages;
+    Vector<AtomicString> languages;
     languages.reserveInitialCapacity(1);
     languages.append(platformLanguage());
     return languages;
 }
 
 static String canonicalLanguageIdentifier(const String& languageCode)
 {
     String lowercaseLanguageCode = languageCode.lower();
 
     if (lowercaseLanguageCode.length() >= 3 && lowercaseLanguageCode[2] == '_')
         lowercaseLanguageCode.replace(2, 1, "-");
 
     return lowercaseLanguageCode;
 }
 
-size_t indexOfBestMatchingLanguageInList(const String& language, const Vector<String>& languageList)
+size_t indexOfBestMatchingLanguageInList(const AtomicString& language, const Vector<AtomicString>& languageList)
 {
-    String languageWithoutLocaleMatch;
-    String languageMatchButNotLocale;
+    AtomicString languageWithoutLocaleMatch;
+    AtomicString languageMatchButNotLocale;
     size_t languageWithoutLocaleMatchIndex = 0;
     size_t languageMatchButNotLocaleMatchIndex = 0;
     bool canMatchLanguageOnly = (language.length() == 2 || (language.length() >= 3 && language[2] == '-'));
 
     for (size_t i = 0; i < languageList.size(); ++i) {
         String canonicalizedLanguageFromList = canonicalLanguageIdentifier(languageList[i]);
 
         if (language == canonicalizedLanguageFromList)
             return i;
 
@@ skipping 17 matching lines @@
     if (languageWithoutLocaleMatch.length())
         return languageWithoutLocaleMatchIndex;
 
     if (languageMatchButNotLocale.length())
         return languageMatchButNotLocaleMatchIndex;
 
     return languageList.size();
 }
 
 }