Changes to support a second VM.

Source/WebCore/dom/ScriptElement.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
  * License as published by the Free Software Foundation; either
@@ skipping 143 matching lines @@
     String type = typeAttributeValue();
     String language = languageAttributeValue();
     if (type.isEmpty() && language.isEmpty())
         return true; // Assume text/javascript.
     if (type.isEmpty()) {
         type = "text/" + language.lower();
         if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(type) || isLegacySupportedJavaScriptLanguage(language))
             return true;
     } else if (MIMETypeRegistry::isSupportedJavaScriptMIMEType(type.stripWhiteSpace().lower()) || (supportLegacyTypes == AllowLegacyTypeInTypeAttribute && isLegacySupportedJavaScriptLanguage(type)))
         return true;
+    else {
+        // FIXME: move JavaScript related logic to ScriptController::isScriptTypeSupported?
+        Frame* frame = m_element->document()->frame();
+        if (frame && frame->script()->isScriptTypeSupported(type.stripWhiteSpace().lower()))
+            return true;
+    }
     return false;
 }
 
 // http://dev.w3.org/html5/spec/Overview.html#prepare-a-script
 bool ScriptElement::prepareScript(const TextPosition& scriptStartPosition, LegacyTypeSupport supportLegacyTypes)
 {
     if (m_alreadyStarted)
         return false;
 
     bool wasParserInserted;
@@ skipping 117 matching lines @@
         return;
 
     RefPtr<Document> document = m_element->document();
     ASSERT(document);
     if (Frame* frame = document->frame()) {
         {
             IgnoreDestructiveWriteCountIncrementer ignoreDesctructiveWriteCountIncrementer(m_isExternalScript ? document.get() : 0);
             // Create a script from the script element node, using the script
             // block's source and the script block's type.
             // Note: This is where the script is compiled and actually executed.
-            frame->script()->evaluate(sourceCode);
+            // FIXME: ScriptSourceCode mimeType should be set by the caller.
+            ScriptSourceCode sourceCodeCopy(sourceCode);
+            sourceCodeCopy.setMimeType(typeAttributeValue().stripWhiteSpace().lower());
+            frame->script()->evaluate(sourceCodeCopy);
         }
 
         Document::updateStyleForAllDocuments();
     }
 }
 
 void ScriptElement::stopLoadRequest()
 {
     if (m_cachedScript) {
         if (!m_willBeParserExecuted)
@@ skipping 94 matching lines @@
 
 #if ENABLE(SVG)
     if (element->isSVGElement() && element->hasTagName(SVGNames::scriptTag))
         return static_cast<SVGScriptElement*>(element);
 #endif
 
     return 0;
 }
 
 }