Move isLegacySupportedJavaScriptLanguage() to MIMETypeRegistry

third_party/WebKit/Source/core/dom/ScriptLoader.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2008 Nikolas Zimmermann <zimmermann@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 129 matching lines @@
   m_nonBlocking = false;
 }
 
 void ScriptLoader::detachPendingScript() {
   if (!m_pendingScript)
     return;
   m_pendingScript->dispose();
   m_pendingScript = nullptr;
 }
 
-static bool isLegacySupportedJavaScriptLanguage(const String& language) {
-  // Mozilla 1.8 accepts javascript1.0 - javascript1.7, but WinIE 7 accepts only
-  // javascript1.1 - javascript1.3.
-  // Mozilla 1.8 and WinIE 7 both accept javascript and livescript.
-  // WinIE 7 accepts ecmascript and jscript, but Mozilla 1.8 doesn't.
-  // Neither Mozilla 1.8 nor WinIE 7 accept leading or trailing whitespace.
-  // We want to accept all the values that either of these browsers accept, but
-  // not other values.
-
-  // FIXME: This function is not HTML5 compliant. These belong in the MIME
-  // registry as "text/javascript<version>" entries.
-  return equalIgnoringASCIICase(language, "javascript") ||
-         equalIgnoringASCIICase(language, "javascript1.0") ||
-         equalIgnoringASCIICase(language, "javascript1.1") ||
-         equalIgnoringASCIICase(language, "javascript1.2") ||
-         equalIgnoringASCIICase(language, "javascript1.3") ||
-         equalIgnoringASCIICase(language, "javascript1.4") ||
-         equalIgnoringASCIICase(language, "javascript1.5") ||
-         equalIgnoringASCIICase(language, "javascript1.6") ||
-         equalIgnoringASCIICase(language, "javascript1.7") ||
-         equalIgnoringASCIICase(language, "livescript") ||
-         equalIgnoringASCIICase(language, "ecmascript") ||
-         equalIgnoringASCIICase(language, "jscript");
-}
-
 void ScriptLoader::dispatchErrorEvent() {
   m_element->dispatchErrorEvent();
 }
 
 void ScriptLoader::dispatchLoadEvent() {
   m_element->dispatchLoadEvent();
   setHaveFiredLoadEvent(true);
 }
 
 bool ScriptLoader::isValidScriptTypeAndLanguage(
     const String& type,
     const String& language,
     LegacyTypeSupport supportLegacyTypes) {
   // FIXME: isLegacySupportedJavaScriptLanguage() is not valid HTML5. It is used
   // here to maintain backwards compatibility with existing layout tests. The
   // specific violations are:
   // - Allowing type=javascript. type= should only support MIME types, such as
   //   text/javascript.
   // - Allowing a different set of languages for language= and type=. language=
   //   supports Javascript 1.1 and 1.4-1.6, but type= does not.
   if (type.isEmpty()) {
     return language.isEmpty() ||  // assume text/javascript.
            MIMETypeRegistry::isSupportedJavaScriptMIMEType("text/" +
                                                            language) ||
-           isLegacySupportedJavaScriptLanguage(language);
+           MIMETypeRegistry::isLegacySupportedJavaScriptLanguage(language);
   } else if (RuntimeEnabledFeatures::moduleScriptsEnabled() &&
              type == "module") {
     return true;
   } else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(
                  type.stripWhiteSpace()) ||
              (supportLegacyTypes == AllowLegacyTypeInTypeAttribute &&
-              isLegacySupportedJavaScriptLanguage(type))) {
+              MIMETypeRegistry::isLegacySupportedJavaScriptLanguage(type))) {
     return true;
   }
 
   return false;
 }
 
 bool ScriptLoader::isScriptTypeSupported(
     LegacyTypeSupport supportLegacyTypes) const {
   return isValidScriptTypeAndLanguage(m_element->typeAttributeValue(),
                                       m_element->languageAttributeValue(),
@@ skipping 395 matching lines @@
 
   return true;
 }
 
 void ScriptLoader::logScriptMIMEType(LocalFrame* frame,
                                      ScriptResource* resource,
                                      const String& mimeType) {
   if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(mimeType))
     return;
   bool isText = mimeType.startsWith("text/", TextCaseASCIIInsensitive);
-  if (isText && isLegacySupportedJavaScriptLanguage(mimeType.substring(5)))
+  if (isText && MIMETypeRegistry::isLegacySupportedJavaScriptLanguage(
+                    mimeType.substring(5)))
     return;
   bool isSameOrigin =
       m_element->document().getSecurityOrigin()->canRequest(resource->url());
   bool isApplication =
       !isText && mimeType.startsWith("application/", TextCaseASCIIInsensitive);
 
   UseCounter::Feature feature =
       isSameOrigin
           ? (isText ? UseCounter::SameOriginTextScript
                     : isApplication ? UseCounter::SameOriginApplicationScript
@@ skipping 225 matching lines @@
   //     then abort these steps at this point. The script is not executed.
   return equalIgnoringCase(eventAttribute, "onload") ||
          equalIgnoringCase(eventAttribute, "onload()");
 }
 
 String ScriptLoader::scriptContent() const {
   return m_element->textFromChildren();
 }
 
 }  // namespace blink