From f980be022184cc6a2283ef2995caf641fda55020 Mon Sep 17 00:00:00 2001
From: "brendan%mozilla.org"
 <brendan%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 31 Oct 1999 00:43:30 +0000
Subject: [PATCH] (13163, r=alecf, scc, waterson, others; names available on
 request)

- Fix most of bug 13163 (see TODO for rest).  This entails adding a version-string argument to nsIScriptContext::EvaluateString and passing it around lots of places in content sinks.

- Fix leaks and confusion about mSecurityManager and mNameSpaceManager in nsJSEnvironment.cpp.  These still need to move from nsJSContext to nsGlobalWindow or thereabouts, jband and vidur are looking at that.

- Added comments and expanded tabs in nsJSEnvironment.cpp, esp. to EvaluateString.  Also changed various nsresult vars to be named rv.  Also restored brace/style conformity to nsJSProtocolHandler.cpp.

- Factored CompileFunction from AddScriptEventListener to pave the way for brutal sharing of compiled JS event handlers via JS_CloneFunctionObject.

- Lots of nsCOMPtr uses added.  I'm using one for mNameSpaceManager.  Hold mSecurityManager as a service explicitly, on the other hand (awaiting scc's fix to allow comptrs for services), and release in nsJSContext's dtor (fixing a leak).  These two managers should be moved to the window object -- TODO item below.

- Hold JSRuntimeService along with JSRuntime for live of nsJSEnvironment, fix for shaver.

- Fix window.setTimeout etc. so the filename and line number of the timeout expr is propagated.  This meant factoring nsJSUtils.cpp code.

- Fix all content sinks to use the same, and up-to-date JavaScript version parsing (whether for script type or for old language attribute); also fix SplitMimeType clones to strip whitespace.

- With waterson, fix bug in brutal-sharing version of XUL content sink: script src= should not evaluate the inline content of its tag.


git-svn-id: svn://10.0.0.236/trunk@52347 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../events/src/nsEventListenerManager.cpp     |  57 +-
 .../html/document/src/nsHTMLContentSink.cpp   |  91 +-
 .../xml/document/src/nsXMLContentSink.cpp     | 272 +++---
 .../xml/document/src/nsXMLContentSink.h       |   3 +-
 .../content/xul/content/src/nsXULElement.h    |   5 +-
 .../xul/document/src/nsXULContentSink.cpp     |  25 +-
 .../xul/document/src/nsXULDocument.cpp        |  31 +-
 .../content/xul/document/src/nsXULDocument.h  |  10 +-
 mozilla/dom/public/nsIScriptContext.h         |   7 +
 mozilla/dom/src/base/nsGlobalWindow.cpp       |  20 +-
 mozilla/dom/src/base/nsGlobalWindow.h         |   4 +-
 mozilla/dom/src/base/nsJSEnvironment.cpp      | 803 ++++++++++--------
 mozilla/dom/src/base/nsJSEnvironment.h        |  15 +-
 mozilla/dom/src/base/nsJSUtils.cpp            |  50 +-
 mozilla/dom/src/base/nsJSUtils.h              |   3 +
 mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp | 114 ++-
 mozilla/editor/base/nsEditorShell.cpp         |   3 +-
 mozilla/editor/composer/src/nsEditorShell.cpp |   3 +-
 .../events/src/nsEventListenerManager.cpp     |  57 +-
 .../html/document/src/nsHTMLContentSink.cpp   |  91 +-
 .../xml/document/src/nsXMLContentSink.cpp     | 272 +++---
 .../xml/document/src/nsXMLContentSink.h       |   3 +-
 mozilla/modules/libpref/src/nsPref.cpp        |   2 +-
 mozilla/modules/libpref/src/prefapi.c         | 121 ++-
 mozilla/modules/libpref/src/prefapi.cpp       | 121 ++-
 mozilla/rdf/base/src/nsRDFParserUtils.cpp     |  53 +-
 mozilla/rdf/base/src/nsRDFParserUtils.h       |   7 +-
 mozilla/rdf/build/dlldeps.cpp                 |   3 +-
 mozilla/rdf/content/src/nsXULContentSink.cpp  |  25 +-
 mozilla/rdf/content/src/nsXULDocument.cpp     |  31 +-
 mozilla/rdf/content/src/nsXULDocument.h       |  10 +-
 mozilla/rdf/content/src/nsXULElement.h        |   5 +-
 mozilla/webshell/tests/viewer/JSConsole.cpp   |   9 +-
 .../xpfe/browser/src/nsBrowserInstance.cpp    |   3 +-
 34 files changed, 1280 insertions(+), 1049 deletions(-)

diff --git a/mozilla/content/events/src/nsEventListenerManager.cpp b/mozilla/content/events/src/nsEventListenerManager.cpp
index e49d14799a1..59f1f7a4a07 100644
--- a/mozilla/content/events/src/nsEventListenerManager.cpp
+++ b/mozilla/content/events/src/nsEventListenerManager.cpp
@@ -431,8 +431,6 @@ nsresult nsEventListenerManager::RemoveEventListenerByType(nsIDOMEventListener *
   return NS_OK;
 }
 
-static const char *gEventArgv[] = {"event"};
-
 nsresult nsEventListenerManager::SetJSEventListener(nsIScriptContext *aContext, JSObject *aObject, REFNSIID aIID)
 {
   nsVoidArray *mListeners;
@@ -464,52 +462,19 @@ nsresult
 nsEventListenerManager::AddScriptEventListener(nsIScriptContext* aContext,
                                                nsIScriptObjectOwner *aScriptObjectOwner,
                                                nsIAtom *aName,
-                                               const nsString& aFunc,
+                                               const nsString& aBody,
                                                REFNSIID aIID)
 {
-  JSObject *scriptObject = nsnull;
-  JSPrincipals *jsprin = nsnull;
-
-  nsCOMPtr<nsIScriptGlobalObject> global = getter_AddRefs(aContext->GetGlobalObject());
-  if (global) {
-    // XXXbe why the two-step QI?  speed up via aContext->GetGlobalObjectData?
-    nsCOMPtr<nsIScriptGlobalObjectData> globalData = do_QueryInterface(global);
-    if (globalData) {
-      nsCOMPtr<nsIPrincipal> prin;
-      if (NS_FAILED(globalData->GetPrincipal(getter_AddRefs(prin))))
-        return NS_ERROR_FAILURE;
-      prin->GetJSPrincipals(&jsprin);
-    }
-  }
-
-  JSContext *cx = (JSContext*)aContext->GetNativeContext();
-  nsresult rv = aScriptObjectOwner->GetScriptObject(aContext,
-                                                    (void**)&scriptObject);
-  if (NS_SUCCEEDED(rv)) {
-    nsString name, lowerName;
-    aName->ToString(name);
-    name.ToLowerCase(lowerName);
-    char* charName = lowerName.ToNewCString();
-    if (!charName) {
-      rv = NS_ERROR_OUT_OF_MEMORY;
-    } else {
-      JSBool ok = JS_CompileUCFunctionForPrincipals(cx, scriptObject, jsprin,
-                                                    charName, 1, gEventArgv,
-                                                    (jschar*)aFunc.GetUnicode(),
-                                                    aFunc.Length(),
-                                                    //XXXbe filename, lineno:
-                                                    nsnull, 0)
-                  != 0;
-      nsCRT::free(charName);
-      if (ok)
-        rv = SetJSEventListener(aContext, scriptObject, aIID);
-      else
-        rv = NS_ERROR_OUT_OF_MEMORY;
-    }
-  }
-  if (jsprin)
-    JSPRINCIPALS_DROP(cx, jsprin);
-  return rv;
+  JSObject *scriptObject;
+  nsresult rv;
+  
+  rv = aScriptObjectOwner->GetScriptObject(aContext, (void**)&scriptObject);
+  if (NS_FAILED(rv))
+    return NS_ERROR_FAILURE;
+  rv = aContext->CompileFunction(scriptObject, aName, aBody);
+  if (NS_FAILED(rv))
+    return NS_ERROR_FAILURE;
+  return SetJSEventListener(aContext, scriptObject, aIID);
 }
 
 nsresult nsEventListenerManager::RegisterScriptEventListener(nsIScriptContext *aContext, nsIScriptObjectOwner *aScriptObjectOwner, 
diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index c6c04586e86..1dd7a5f9702 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -33,6 +33,7 @@
 #include "nsHTMLTokens.h"  
 #include "nsHTMLEntities.h" 
 #include "nsCRT.h"
+#include "jsapi.h" // for JSVERSION_* and JS_VersionToString
 #include "prtime.h"
 #include "prlog.h"
 
@@ -263,7 +264,9 @@ public:
   PRBool   PreEvaluateScript();
   void     PostEvaluateScript(PRBool aBodyPresent);
   nsresult EvaluateScript(nsString& aScript,
-                          PRInt32 aLineNo);
+                          PRInt32 aLineNo,
+                          const char* aVersion);
+  const char* mScriptLanguageVersion;
 
   void UpdateAllContexts();
   void NotifyAppend(nsIContent* aContent, 
@@ -3113,10 +3116,12 @@ static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aPa
   if (-1 != semiIndex) {
     aValue.Left(aType, semiIndex);
     aValue.Right(aParams, (aValue.Length() - semiIndex) - 1);
+    aParams.StripWhitespace();
   }
   else {
     aType = aValue;
   }
+  aType.StripWhitespace();
 }
 
 nsresult
@@ -3415,28 +3420,34 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode)
 // Returns PR_TRUE if the language name is a version of JavaScript and
 // PR_FALSE otherwise
 static PRBool
-IsJavaScriptLanguage(const nsString& aName)
+IsJavaScriptLanguage(const nsString& aName, const char* *aVersion)
 {
-  if (aName.EqualsIgnoreCase("JavaScript") || 
-      aName.EqualsIgnoreCase("LiveScript") || 
-      aName.EqualsIgnoreCase("Mocha")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.1")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.2")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.3")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.4")) { 
-    return PR_TRUE;
-  } 
-  else { 
+  JSVersion version = JSVERSION_UNKNOWN;
+
+  if (aName.EqualsIgnoreCase("JavaScript") ||
+      aName.EqualsIgnoreCase("LiveScript") ||
+      aName.EqualsIgnoreCase("Mocha")) {
+    version = JSVERSION_DEFAULT;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.1")) {
+    version = JSVERSION_1_1;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.2")) {
+    version = JSVERSION_1_2;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.3")) {
+    version = JSVERSION_1_3;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.4")) {
+    version = JSVERSION_1_4;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.5")) {
+    version = JSVERSION_1_5;
+  }
+  if (version == JSVERSION_UNKNOWN)
     return PR_FALSE;
-  } 
+  *aVersion = JS_VersionToString(version);
+  return PR_TRUE;
 }
 
 #ifdef DEBUG
@@ -3525,7 +3536,8 @@ HTMLContentSink::IsInScript()
 
 nsresult
 HTMLContentSink::EvaluateScript(nsString& aScript,
-                                PRInt32 aLineNo)
+                                PRInt32 aLineNo,
+                                const char* aVersion)
 {
   nsresult rv = NS_OK;
 
@@ -3555,7 +3567,7 @@ HTMLContentSink::EvaluateScript(nsString& aScript,
   
       PRBool isUndefined;
       context->EvaluateString(aScript, nsnull, principal, url, 
-                              aLineNo, ret, &isUndefined);
+                              aLineNo, aVersion, ret, &isUndefined);
       
       if (docURL) {
         NS_RELEASE(docURL);
@@ -3579,11 +3591,10 @@ nsDoneLoadingScript(nsIUnicharStreamLoader* aLoader,
   HTMLContentSink* sink = (HTMLContentSink*)aRef;
 
   if (NS_OK == aStatus) {
-
     PRBool bodyPresent = sink->PreEvaluateScript();
 
     // XXX We have no way of indicating failure. Silently fail?
-    sink->EvaluateScript(aData, 0);
+    sink->EvaluateScript(aData, 0, sink->mScriptLanguageVersion);
 
     sink->PostEvaluateScript(bodyPresent);
   }
@@ -3602,7 +3613,8 @@ nsresult
 HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
 {
   nsresult rv = NS_OK;
-  PRBool   isJavaScript = PR_TRUE;
+  PRBool isJavaScript = PR_TRUE;
+  const char* jsVersionString = nsnull;
   PRInt32 i, ac = aNode.GetAttributeCount();
 
   // Look for SRC attribute and look for a LANGUAGE attribute
@@ -3621,14 +3633,31 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
       nsAutoString  params;
       SplitMimeType(type, mimeType, params);
 
-      isJavaScript = mimeType.EqualsIgnoreCase("text/javascript") || 
-        mimeType.EqualsIgnoreCase("application/x-javascript");
+      isJavaScript = mimeType.EqualsIgnoreCase("application/x-javascript") || 
+                     mimeType.EqualsIgnoreCase("text/javascript");
+      if (isJavaScript) {
+        JSVersion jsVersion = JSVERSION_DEFAULT;
+        if (params.Find("version=", PR_TRUE) == 0) {
+          if (params.Length() != 11 || params[8] != '1' || params[9] != '.')
+            jsVersion = JSVERSION_UNKNOWN;
+          else switch (params[10]) {
+            case '0': jsVersion = JSVERSION_1_0; break;
+            case '1': jsVersion = JSVERSION_1_1; break;
+            case '2': jsVersion = JSVERSION_1_2; break;
+            case '3': jsVersion = JSVERSION_1_3; break;
+            case '4': jsVersion = JSVERSION_1_4; break;
+            case '5': jsVersion = JSVERSION_1_5; break;
+            default:  jsVersion = JSVERSION_UNKNOWN;
+          }
+        }
+        jsVersionString = JS_VersionToString(jsVersion);
+      }
     }
     else if (key.EqualsIgnoreCase("language")) {
       nsAutoString  lang;
        
       GetAttributeValueAt(aNode, i, lang, nsnull);
-      isJavaScript = IsJavaScriptLanguage(lang);
+      isJavaScript = IsJavaScriptLanguage(lang, &jsVersionString);
     }
   }
 
@@ -3695,6 +3724,8 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
   // Don't process scripts that aren't JavaScript and don't process
   // scripts that are inside iframes
   if (isJavaScript && !mNumOpenIFRAMES) {
+    mScriptLanguageVersion = jsVersionString;
+
     // If there is a SRC attribute...
     if (src.Length() > 0) {
       // Use the SRC attribute value to load the URL
@@ -3729,7 +3760,7 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
 
       PRUint32 lineNo = (PRUint32)aNode.GetSourceLineNumber();
 
-      EvaluateScript(script, lineNo);
+      EvaluateScript(script, lineNo, jsVersionString);
 
       PostEvaluateScript(bodyPresent);
 
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index 302aa1daaeb..dab8146fe10 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@@ -42,8 +42,8 @@
 #include "nsIDOMComment.h"
 #include "nsIDOMCDATASection.h"
 #include "nsIHTMLContent.h"
-#include "nsHTMLEntities.h" 
-#include "nsHTMLParts.h" 
+#include "nsHTMLEntities.h"
+#include "nsHTMLParts.h"
 #include "nsVoidArray.h"
 #include "nsCRT.h"
 #include "nsICSSLoader.h"
@@ -56,6 +56,7 @@
 #include "nsINameSpace.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContentViewer.h"
+#include "jsapi.h" // for JSVERSION_* and JS_VersionToString
 #include "prtime.h"
 #include "prlog.h"
 #include "prmem.h"
@@ -71,7 +72,7 @@
 #endif
 
 // XXX misnamed header file, but oh well
-#include "nsHTMLTokens.h"  
+#include "nsHTMLTokens.h"
 
 static char kNameSpaceSeparator = ':';
 static char kNameSpaceDef[] = "xmlns";
@@ -194,7 +195,7 @@ nsXMLContentSink::~nsXMLContentSink()
     PR_FREEIF(mText);
   }
   NS_IF_RELEASE(mCSSLoader);
-#ifdef XSL  
+#ifdef XSL
   NS_IF_RELEASE(mXSLTransformMediator);
 #endif
 }
@@ -257,12 +258,12 @@ nsXMLContentSink::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     *aInstancePtr = (void*)(nsIXMLContentSink*)this;
     NS_ADDREF_THIS();
     return NS_OK;
-  }    
+  }
   if (aIID.Equals(kIObserverIID)) {
     *aInstancePtr = (void*)(nsIObserver*)this;
     NS_ADDREF_THIS();
     return NS_OK;
-  }  
+  }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtr = (void*)(nsISupports*)(nsIXMLContentSink*)this;
     NS_ADDREF_THIS();
@@ -274,7 +275,7 @@ nsXMLContentSink::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 #endif
 
   // nsIContentSink
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::WillBuildModel(void)
 {
   // Notify document that the load is beginning
@@ -282,7 +283,7 @@ nsXMLContentSink::WillBuildModel(void)
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
 {
   // XXX this is silly; who cares?
@@ -303,8 +304,8 @@ nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
 #else
   nsresult rv;
   if (mXSLTransformMediator) {
-    rv = SetupTransformMediator();  
-  } 
+    rv = SetupTransformMediator();
+  }
 
   if (!mXSLTransformMediator || NS_FAILED(rv)) {
     mDocument->SetRootContent(mDocElement);
@@ -319,7 +320,7 @@ nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
   return NS_OK;
 }
 
-void 
+void
 nsXMLContentSink::StartLayoutProcess()
 {
   StartLayout();
@@ -353,13 +354,13 @@ nsXMLContentSink::Observe(nsISupports *aSubject, const PRUnichar *aTopic, const
 
   // Reset the observer on the transform mediator
   mXSLTransformMediator->SetTransformObserver(nsnull);
-  
+
   return rv;
 }
 
 
 // Provide the transform mediator with the source document's content
-// model and the output document, and register the XML content sink 
+// model and the output document, and register the XML content sink
 // as the transform observer.  The transform mediator will call
 // the nsIObserver::Observe() method on the transform observer once
 // the transform is completed.  The nsISupports pointer to the Observe
@@ -388,13 +389,13 @@ nsXMLContentSink::SetupTransformMediator()
 }
 #endif
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::WillInterrupt(void)
 {
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::WillResume(void)
 {
   return NS_OK;
@@ -406,7 +407,7 @@ nsXMLContentSink::SetParser(nsIParser* aParser)
   NS_IF_RELEASE(mParser);
   mParser = aParser;
   NS_IF_ADDREF(mParser);
-  
+
   return NS_OK;
 }
 
@@ -437,11 +438,11 @@ nsXMLContentSink::GetAttributeValueAt(const nsIParserNode& aNode,
 
   if (mParser) {
     nsCOMPtr<nsIDTD> dtd;
-    
+
     nsresult rv = mParser->GetDTD(getter_AddRefs(dtd));
-    
+
     if (NS_SUCCEEDED(rv)) {
-      
+
       // Reduce any entities
       // XXX Note: as coded today, this will only convert well formed
       // entities.  This may not be compatible enough.
@@ -488,7 +489,7 @@ nsXMLContentSink::GetAttributeValueAt(const nsIParserNode& aNode,
             if (ch > 65535) {
               continue;
             }
-        
+
             // Remove entity from string and replace it with the integer
             // value.
             aResult.Cut(start, index - start);
@@ -576,7 +577,7 @@ nsXMLContentSink::AddAttributes(const nsIParserNode& aNode,
     }
 
     nsAutoString value;
-    if (NS_CONTENT_ATTR_NOT_THERE == 
+    if (NS_CONTENT_ATTR_NOT_THERE ==
         aContent->GetAttribute(nameSpaceID, nameAtom, value)) {
       // Get value and remove mandatory quotes
       GetAttributeValueAt(aNode, i, v);
@@ -638,7 +639,7 @@ nsXMLContentSink::PushNameSpacesFrom(const nsIParserNode& aNode)
 
         // Get the attribute value (the URI for the namespace)
         GetAttributeValueAt(aNode, i, uri);
-      
+
         // Open a local namespace
         nsIAtom* prefixAtom = ((0 < prefix.Length()) ? NS_NewAtom(prefix) : nsnull);
         nsINameSpace* child = nsnull;
@@ -671,7 +672,7 @@ nsIAtom*  nsXMLContentSink::CutNameSpacePrefix(nsString& aString)
   return nsnull;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
 {
   nsresult result = NS_OK;
@@ -739,10 +740,10 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
         mDocElement = content;
         NS_ADDREF(mDocElement);
 
-        // For XSL, we need to wait till after the transform 
+        // For XSL, we need to wait till after the transform
         // to set the root content object.  Hence, the following
         // ifndef.
-#ifndef XSL         
+#ifndef XSL
         mDocument->SetRootContent(mDocElement);
 #endif
       }
@@ -760,7 +761,7 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
 {
   nsresult result = NS_OK;
@@ -810,7 +811,7 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
   nsINameSpace* nameSpace = PopNameSpaces();
   if (nsnull != content) {
     nsIXMLContent* xmlContent;
-    if (NS_OK == content->QueryInterface(kIXMLContentIID, 
+    if (NS_OK == content->QueryInterface(kIXMLContentIID,
                                          (void **)&xmlContent)) {
       xmlContent->SetContainingNameSpace(nameSpace);
       NS_RELEASE(xmlContent);
@@ -821,7 +822,7 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddLeaf(const nsIParserNode& aNode)
 {
   // XXX For now, all leaf content is character data
@@ -862,7 +863,7 @@ nsXMLContentSink::AddLeaf(const nsIParserNode& aNode)
 }
 
 nsresult nsXMLContentSink::CreateErrorText(const nsParserError* aError, nsString& aErrorString)
-{    
+{
   nsString errorText("XML Parsing Error: ");
 
   if (aError) {
@@ -873,14 +874,14 @@ nsresult nsXMLContentSink::CreateErrorText(const nsParserError* aError, nsString
     errorText.Append(aError->colNumber, 10);
     errorText.Append(":");
   }
-  
+
   aErrorString = errorText;
-  
+
   return NS_OK;
 }
 
 nsresult nsXMLContentSink::CreateSourceText(const nsParserError* aError, nsString& aSourceString)
-{  
+{
   nsString sourceText;
   PRInt32 errorPosition = aError->colNumber;
 
@@ -924,11 +925,11 @@ static void SetTextStringOnTextNode(const nsString& aTextString, nsIContent* aTe
  */
 NS_IMETHODIMP
 nsXMLContentSink::NotifyError(const nsParserError* aError)
-{  
+{
   nsresult result = NS_OK;
   nsAutoString parserErrorTag = "parsererror";
   nsAutoString sourceTextTag = "sourcetext";
-  nsString errorText;  
+  nsString errorText;
   nsString sourceText;
   nsIHTMLContent* errorContainerNode = nsnull;
   nsIHTMLContent* sourceContainerNode = nsnull;
@@ -937,9 +938,9 @@ nsXMLContentSink::NotifyError(const nsParserError* aError)
 
   /* Create container and text content nodes */
   result = NS_CreateHTMLElement(&errorContainerNode, parserErrorTag); // XXX these should NOT be in the HTML namespace
-  if (NS_OK == result) {  
+  if (NS_OK == result) {
     result = NS_NewTextNode(&errorTextNode);
-    if (NS_OK == result) {    
+    if (NS_OK == result) {
       result = NS_CreateHTMLElement(&sourceContainerNode, sourceTextTag);
       if (NS_OK == result) {
         result = NS_NewTextNode(&sourceTextNode);
@@ -978,12 +979,12 @@ nsXMLContentSink::NotifyError(const nsParserError* aError)
     errorContainerNode->AppendChildTo(sourceContainerNode, PR_FALSE);
     sourceContainerNode->AppendChildTo(sourceTextNode, PR_FALSE);
   }
-  
+
   return result;
 }
 
 // nsIXMLContentSink
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddXMLDecl(const nsIParserNode& aNode)
 {
   // XXX We'll ignore it for now
@@ -993,27 +994,27 @@ nsXMLContentSink::AddXMLDecl(const nsIParserNode& aNode)
 
 nsresult
 nsXMLContentSink::AddContentAsLeaf(nsIContent *aContent)
-{      
+{
   nsresult result = NS_OK;
 
   if (eXMLContentSinkState_InProlog == mState) {
     result = mDocument->AppendToProlog(aContent);
   }
-  else if (eXMLContentSinkState_InEpilog == mState) {   
+  else if (eXMLContentSinkState_InEpilog == mState) {
     result = mDocument->AppendToEpilog(aContent);
   }
   else {
     nsIContent *parent = GetCurrentContent();
-    
+
     if (nsnull != parent) {
       result = parent->AppendChildTo(aContent, PR_FALSE);
     }
   }
-  
+
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddComment(const nsIParserNode& aNode)
 {
   FlushText();
@@ -1040,7 +1041,7 @@ nsXMLContentSink::AddComment(const nsIParserNode& aNode)
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddCDATASection(const nsIParserNode& aNode)
 {
   FlushText();
@@ -1069,7 +1070,7 @@ nsXMLContentSink::AddCDATASection(const nsIParserNode& aNode)
 
 
 static nsresult
-GetQuotedAttributeValue(nsString& aSource, 
+GetQuotedAttributeValue(nsString& aSource,
                         const nsString& aAttribute,
                         nsString& aValue)
 {
@@ -1086,9 +1087,9 @@ GetQuotedAttributeValue(nsString& aSource,
       endOffset = aSource.FindChar(kQuote,PR_FALSE, ++offset);
     }
     else if (kApostrophe == next) {
-      endOffset = aSource.FindChar(kApostrophe, PR_FALSE,++offset);	  
+      endOffset = aSource.FindChar(kApostrophe, PR_FALSE,++offset);
     }
-  
+
     if (-1 != endOffset) {
       aSource.Mid(aValue, offset, endOffset-offset);
     }
@@ -1129,15 +1130,17 @@ static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aPa
   if (-1 != semiIndex) {
     aValue.Left(aType, semiIndex);
     aValue.Right(aParams, (aValue.Length() - semiIndex) - 1);
+    aParams.StripWhitespace();
   }
   else {
     aType = aValue;
   }
+  aType.StripWhitespace();
 }
 
 #ifdef XSL
 nsresult
-nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl, 
+nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
                                       const nsAutoString& aHref)
 {
   nsresult result = NS_OK;
@@ -1146,7 +1149,7 @@ nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
 #else
   nsAutoString absURL;
   nsIURI* docURL = mDocument->GetDocumentURL();
-  nsILoadGroup* LoadGroup; 
+  nsILoadGroup* LoadGroup;
 
   result = docURL->GetLoadGroup(&LoadGroup);
 
@@ -1170,7 +1173,7 @@ nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
 // the XSL stylesheet located at the given URL.
 nsresult
 nsXMLContentSink::LoadXSLStyleSheet(nsIURI* aUrl, const nsString& aType)
-{  
+{
   nsresult rv = NS_OK;
   nsCOMPtr<nsIParser> parser;
 
@@ -1178,9 +1181,9 @@ nsXMLContentSink::LoadXSLStyleSheet(nsIURI* aUrl, const nsString& aType)
   static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
 
   // Create the XML parser
-  rv = nsComponentManager::CreateInstance(kCParserCID, 
-                                    nsnull, 
-                                    kCParserIID, 
+  rv = nsComponentManager::CreateInstance(kCParserCID,
+                                    nsnull,
+                                    kCParserIID,
                                     getter_AddRefs(parser));
 
   if (NS_FAILED(rv)) return rv;
@@ -1189,28 +1192,28 @@ nsXMLContentSink::LoadXSLStyleSheet(nsIURI* aUrl, const nsString& aType)
   rv = NS_NewTransformMediator(&mXSLTransformMediator, aType);
   if (NS_FAILED(rv)) return rv;
 
-    
+
   // Enable the transform mediator. It will start the transform
   // as soon as it has enough state to do so.  The state needed is
   // the source content model, the style content model, the current
-  // document, and an observer.  The XML and XSL content sinks provide 
+  // document, and an observer.  The XML and XSL content sinks provide
   // this state by calling the various setters on nsITransformMediator.
   mXSLTransformMediator->SetEnabled(PR_TRUE);
 
   // The XML document owns the transform mediator.  Give the mediator to
   // the XML document.
   nsCOMPtr<nsIXMLDocument> xmlDoc;
-  rv = mDocument->QueryInterface(kIXMLDocumentIID, (void**) getter_AddRefs(xmlDoc));  
+  rv = mDocument->QueryInterface(kIXMLDocumentIID, (void**) getter_AddRefs(xmlDoc));
   if (NS_FAILED(rv)) return rv;
   xmlDoc->SetTransformMediator(mXSLTransformMediator);
 
   // Create the XSL content sink
   nsCOMPtr<nsIXMLContentSink> sink;
   rv = NS_NewXSLContentSink(getter_AddRefs(sink), mXSLTransformMediator, mDocument, aUrl, mWebShell);
-  if (NS_FAILED(rv)) return rv;  
-              
+  if (NS_FAILED(rv)) return rv;
+
   // Hook up the content sink to the parser's output and ask the parser
-  // to start parsing the URL specified by aURL.   
+  // to start parsing the URL specified by aURL.
   parser->SetContentSink(sink);
   nsAutoString utf8("UTF-8");
   mDocument->SetDocumentCharacterSet(utf8);
@@ -1220,9 +1223,9 @@ nsXMLContentSink::LoadXSLStyleSheet(nsIURI* aUrl, const nsString& aType)
   // Set the parser as the stream listener and start the URL load
   nsCOMPtr<nsIStreamListener> sl;
   rv = mParser->QueryInterface(kIStreamListenerIID, (void**)getter_AddRefs(sl));
-  if (NS_FAILED(rv)) return rv; 
-  
-  rv = NS_OpenURI(sl, nsnull, aUrl);  
+  if (NS_FAILED(rv)) return rv;
+
+  rv = NS_OpenURI(sl, nsnull, aUrl);
 
   return rv;
 }
@@ -1251,13 +1254,13 @@ nsXMLContentSink::ProcessXSLStyleLink(nsIContent* aElement,
 {
   nsresult rv = NS_OK;
   nsIURI* url;
-  
+
   rv = CreateStyleSheetURL(&url, aHref);
   if (NS_SUCCEEDED(rv)) {
     rv = LoadXSLStyleSheet(url, aType);
     NS_RELEASE(url);
   }
-  
+
   return rv;
 }
 #endif
@@ -1316,7 +1319,7 @@ nsXMLContentSink::ProcessCSSStyleLink(nsIContent* aElement,
 
     PRBool doneLoading;
     result = mCSSLoader->LoadStyleLink(aElement, url, aTitle, aMedia, kNameSpaceID_Unknown,
-                                       mStyleSheetCount++, 
+                                       mStyleSheetCount++,
                                       ((blockParser) ? mParser : nsnull),
                                       doneLoading);
     NS_RELEASE(url);
@@ -1327,7 +1330,7 @@ nsXMLContentSink::ProcessCSSStyleLink(nsIContent* aElement,
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
 {
   nsresult result = NS_OK;
@@ -1346,7 +1349,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
 
   if (NS_OK == result) {
     nsAutoString type, href, title, media, alternate;
-    
+
     // If it's a stylesheet PI...
     if (target.EqualsIgnoreCase(kStyleSheetPI)) {
       result = GetQuotedAttributeValue(text, "href", href);
@@ -1355,7 +1358,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
       if ((NS_OK != result) || (0 == href.Length())) {
         return result;
       }
-      
+
       result = GetQuotedAttributeValue(text, "type", type);
       if (NS_OK != result) {
         return result;
@@ -1374,7 +1377,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
       if (NS_OK != result) {
         return result;
       }
-#ifndef XSL      
+#ifndef XSL
       result = ProcessCSSStyleLink(node, href, alternate.Equals("yes"),
                                 title, type, media);
 #else
@@ -1388,7 +1391,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
 }
 
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode)
 {
   printf("nsXMLContentSink::AddDocTypeDecl\n");
@@ -1407,7 +1410,7 @@ nsXMLContentSink::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
       if (NS_OK == rv) {
         // Set the content's document
         content->SetDocument(mDocument, PR_FALSE);
-        
+
         // Set the text in the text node
         static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID);
         nsITextContent* text = nsnull;
@@ -1416,7 +1419,7 @@ nsXMLContentSink::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
         NS_RELEASE(text);
 
         // Add text to its parent
-        AddContentAsLeaf(content);      
+        AddContentAsLeaf(content);
         NS_RELEASE(content);
       }
     }
@@ -1431,7 +1434,7 @@ nsXMLContentSink::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
 
 #define NS_ACCUMULATION_BUFFER_SIZE 4096
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddCharacterData(const nsIParserNode& aNode)
 {
   return AddText(aNode.GetText());
@@ -1486,28 +1489,28 @@ nsXMLContentSink::AddText(const nsString& aString)
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddUnparsedEntity(const nsIParserNode& aNode)
 {
   printf("nsXMLContentSink::AddUnparsedEntity\n");
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddNotation(const nsIParserNode& aNode)
 {
   printf("nsXMLContentSink::AddNotation\n");
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddEntityReference(const nsIParserNode& aNode)
 {
   printf("nsXMLContentSink::AddEntityReference\n");
   return NS_OK;
 }
 
-PRInt32 
+PRInt32
 nsXMLContentSink::GetNameSpaceId(nsIAtom* aPrefix)
 {
   PRInt32 id = (nsnull == aPrefix) ? kNameSpaceID_None : kNameSpaceID_Unknown;
@@ -1520,7 +1523,7 @@ nsXMLContentSink::GetNameSpaceId(nsIAtom* aPrefix)
   return id;
 }
 
-nsINameSpace*    
+nsINameSpace*
 nsXMLContentSink::PopNameSpaces()
 {
   if ((nsnull != mNameSpaceStack) && (0 < mNameSpaceStack->Count())) {
@@ -1533,13 +1536,13 @@ nsXMLContentSink::PopNameSpaces()
   return nsnull;
 }
 
-PRBool  
+PRBool
 nsXMLContentSink::IsHTMLNameSpace(PRInt32 aID)
 {
   return PRBool(kNameSpaceID_HTML == aID);
 }
 
-nsIContent* 
+nsIContent*
 nsXMLContentSink::GetCurrentContent()
 {
   if (nsnull != mContentStack) {
@@ -1549,17 +1552,17 @@ nsXMLContentSink::GetCurrentContent()
   return nsnull;
 }
 
-PRInt32 
+PRInt32
 nsXMLContentSink::PushContent(nsIContent *aContent)
 {
   if (nsnull == mContentStack) {
     mContentStack = new nsVoidArray();
   }
-  
+
   mContentStack->AppendElement((void *)aContent);
   return mContentStack->Count();
 }
- 
+
 nsIContent*
 nsXMLContentSink::PopContent()
 {
@@ -1571,7 +1574,7 @@ nsXMLContentSink::PopContent()
   }
   return content;
 }
- 
+
 void
 nsXMLContentSink::StartLayout()
 {
@@ -1666,12 +1669,12 @@ nsXMLContentSink::ResumeParsing()
   if (nsnull != mParser) {
     mParser->EnableParser(PR_TRUE);
   }
-  
+
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsXMLContentSink::EvaluateScript(nsString& aScript, PRUint32 aLineNo)
+nsXMLContentSink::EvaluateScript(nsString& aScript, PRUint32 aLineNo, const char* aVersion)
 {
   nsresult rv = NS_OK;
 
@@ -1680,13 +1683,13 @@ nsXMLContentSink::EvaluateScript(nsString& aScript, PRUint32 aLineNo)
     nsIScriptContext *context;
     owner = mDocument->GetScriptContextOwner();
     if (nsnull != owner) {
-      
+
       rv = owner->GetScriptContext(&context);
       if (rv != NS_OK) {
         NS_RELEASE(owner);
         return rv;
       }
-        
+
       nsIURI* docURL = mDocument->GetDocumentURL();
 #ifdef NECKO
       char* url;
@@ -1701,11 +1704,11 @@ nsXMLContentSink::EvaluateScript(nsString& aScript, PRUint32 aLineNo)
         nsAutoString val;
         PRBool isUndefined;
 
-        (void) context->EvaluateString(aScript, url, aLineNo, 
+        (void) context->EvaluateString(aScript, url, aLineNo, aVersion,
                                        val, &isUndefined);
-      
+
         NS_IF_RELEASE(docURL);
-      
+
         NS_RELEASE(context);
         NS_RELEASE(owner);
 #ifdef NECKO
@@ -1725,7 +1728,7 @@ nsXMLContentSink::ProcessEndSCRIPTTag(const nsIParserNode& aNode)
   if (mInScript) {
     nsAutoString script;
     script.SetString(mText, mTextLength);
-    result = EvaluateScript(script, mScriptLineNo);
+    result = EvaluateScript(script, mScriptLineNo, mScriptLanguageVersion);
     FlushText(PR_FALSE);
     mInScript = PR_FALSE;
   }
@@ -1736,31 +1739,38 @@ nsXMLContentSink::ProcessEndSCRIPTTag(const nsIParserNode& aNode)
 #define SCRIPT_BUF_SIZE 1024
 
 // XXX Stolen from nsHTMLContentSink. Needs to be shared.
+// XXXbe share also with nsRDFParserUtils.cpp and nsHTMLContentSink.cpp
 // Returns PR_TRUE if the language name is a version of JavaScript and
 // PR_FALSE otherwise
 static PRBool
-IsJavaScriptLanguage(const nsString& aName)
+IsJavaScriptLanguage(const nsString& aName, const char* *aVersion)
 {
-  if (aName.EqualsIgnoreCase("JavaScript") || 
-      aName.EqualsIgnoreCase("LiveScript") || 
-      aName.EqualsIgnoreCase("Mocha")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.1")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.2")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.3")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.4")) { 
-    return PR_TRUE;
-  } 
-  else { 
+  JSVersion version = JSVERSION_UNKNOWN;
+
+  if (aName.EqualsIgnoreCase("JavaScript") ||
+      aName.EqualsIgnoreCase("LiveScript") ||
+      aName.EqualsIgnoreCase("Mocha")) {
+    version = JSVERSION_DEFAULT;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.1")) {
+    version = JSVERSION_1_1;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.2")) {
+    version = JSVERSION_1_2;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.3")) {
+    version = JSVERSION_1_3;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.4")) {
+    version = JSVERSION_1_4;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.5")) {
+    version = JSVERSION_1_5;
+  }
+  if (version == JSVERSION_UNKNOWN)
     return PR_FALSE;
-  } 
+  *aVersion = JS_VersionToString(version);
+  return PR_TRUE;
 }
 
 static void
@@ -1773,7 +1783,7 @@ nsDoneLoadingScript(nsIUnicharStreamLoader* aLoader,
 
   if (NS_OK == aStatus) {
     // XXX We have no way of indicating failure. Silently fail?
-    sink->EvaluateScript(aData, 0);
+    sink->EvaluateScript(aData, 0, sink->mScriptLanguageVersion);
   }
 
   sink->ResumeParsing();
@@ -1790,7 +1800,8 @@ nsresult
 nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
 {
   nsresult rv = NS_OK;
-  PRBool   isJavaScript = PR_TRUE;
+  PRBool isJavaScript = PR_TRUE;
+  const char* jsVersionString = nsnull;
   PRInt32 i, ac = aNode.GetAttributeCount();
 
   // Look for SRC attribute and look for a LANGUAGE attribute
@@ -1802,25 +1813,42 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
     }
     else if (key.EqualsIgnoreCase("type")) {
       nsAutoString  type;
-      
+
       GetAttributeValueAt(aNode, i, type);
       nsAutoString  mimeType;
       nsAutoString  params;
       SplitMimeType(type, mimeType, params);
 
       isJavaScript = mimeType.EqualsIgnoreCase("text/javascript");
+      if (isJavaScript) {
+        JSVersion jsVersion = JSVERSION_DEFAULT;
+        if (params.Find("version=", PR_TRUE) == 0) {
+          if (params.Length() != 11 || params[8] != '1' || params[9] != '.')
+            jsVersion = JSVERSION_UNKNOWN;
+          else switch (params[10]) {
+            case '0': jsVersion = JSVERSION_1_0; break;
+            case '1': jsVersion = JSVERSION_1_1; break;
+            case '2': jsVersion = JSVERSION_1_2; break;
+            case '3': jsVersion = JSVERSION_1_3; break;
+            case '4': jsVersion = JSVERSION_1_4; break;
+            case '5': jsVersion = JSVERSION_1_5; break;
+            default:  jsVersion = JSVERSION_UNKNOWN;
+          }
+        }
+        jsVersionString = JS_VersionToString(jsVersion);
+      }
     }
     else if (key.EqualsIgnoreCase("language")) {
       nsAutoString  lang;
-      
+
       GetAttributeValueAt(aNode, i, lang);
-      isJavaScript = IsJavaScriptLanguage(lang);
+      isJavaScript = IsJavaScriptLanguage(lang, &jsVersionString);
     }
   }
-  
+
   // Don't process scripts that aren't JavaScript
   if (isJavaScript) {
-    nsAutoString script;
+    mScriptLanguageVersion = jsVersionString;
 
     // If there is a SRC attribute...
     if (src.Length() > 0) {
@@ -1856,9 +1884,9 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
 
       mDocument->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
       rv = NS_NewUnicharStreamLoader(&loader,
-                                     url, 
+                                     url,
                                      loadGroup,
-                                     (nsStreamCompleteFunc)nsDoneLoadingScript, 
+                                     (nsStreamCompleteFunc)nsDoneLoadingScript,
                                      (void *)this);
       NS_RELEASE(url);
       if (NS_OK == rv) {
@@ -1888,7 +1916,7 @@ nsXMLContentSink::RefreshIfEnabled(nsIViewManager* vm)
       if (enabled) {
         vm->EnableRefresh();
       }
-      NS_RELEASE(contentViewer); 
+      NS_RELEASE(contentViewer);
     }
   }
   return NS_OK;
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.h b/mozilla/content/xml/document/src/nsXMLContentSink.h
index c0f1f6563c0..3c213189e1f 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.h
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.h
@@ -95,7 +95,8 @@ public:
 #endif
 
   NS_IMETHOD ResumeParsing();
-  NS_IMETHOD EvaluateScript(nsString& aScript, PRUint32 aLineNo);
+  NS_IMETHOD EvaluateScript(nsString& aScript, PRUint32 aLineNo, const char* aVersion);
+  const char* mScriptLanguageVersion;
 
 protected:
   void StartLayout();
diff --git a/mozilla/content/xul/content/src/nsXULElement.h b/mozilla/content/xul/content/src/nsXULElement.h
index 5cd04ee9f75..f50e381c8b8 100644
--- a/mozilla/content/xul/content/src/nsXULElement.h
+++ b/mozilla/content/xul/content/src/nsXULElement.h
@@ -164,8 +164,8 @@ public:
 class nsXULPrototypeScript : public nsXULPrototypeNode
 {
 public:
-    nsXULPrototypeScript(PRInt32 aLineNo)
-        : nsXULPrototypeNode(eType_Script, aLineNo)
+    nsXULPrototypeScript(PRInt32 aLineNo, const char *aVersion)
+        : nsXULPrototypeNode(eType_Script, aLineNo), mVersion(aVersion)
     {
         MOZ_COUNT_CTOR(nsXULPrototypeScript);
     }
@@ -177,6 +177,7 @@ public:
 
     nsCOMPtr<nsIURI>         mSrcURI;
     nsString                 mInlineScript;
+    const char*              mVersion;
 };
 
 class nsXULPrototypeText : public nsXULPrototypeNode
diff --git a/mozilla/content/xul/document/src/nsXULContentSink.cpp b/mozilla/content/xul/document/src/nsXULContentSink.cpp
index 495fefdb852..a60c0984061 100644
--- a/mozilla/content/xul/document/src/nsXULContentSink.cpp
+++ b/mozilla/content/xul/document/src/nsXULContentSink.cpp
@@ -82,6 +82,7 @@
 #include "prlog.h"
 #include "prmem.h"
 #include "rdfutil.h"
+#include "jspubtd.h"            // for JSVERSION_*
 
 #include "nsHTMLTokens.h" // XXX so we can use nsIParserNode::GetTokenType()
 
@@ -801,10 +802,12 @@ static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aPa
   if (-1 != semiIndex) {
     aValue.Left(aType, semiIndex);
     aValue.Right(aParams, (aValue.Length() - semiIndex) - 1);
+    aParams.StripWhitespace();
   }
   else {
     aType = aValue;
   }
+  aType.StripWhitespace();
 }
 
 
@@ -1516,6 +1519,7 @@ XULContentSinkImpl::OpenScript(const nsIParserNode& aNode)
 {
     nsresult rv = NS_OK;
     PRBool isJavaScript = PR_TRUE;
+    const char* jsVersionString = nsnull;
     PRInt32 ac = aNode.GetAttributeCount();
 
     // Look for SRC attribute and look for a LANGUAGE attribute
@@ -1534,17 +1538,34 @@ XULContentSinkImpl::OpenScript(const nsIParserNode& aNode)
             SplitMimeType(type, mimeType, params);
 
             isJavaScript = mimeType.EqualsIgnoreCase("text/javascript");
+            if (isJavaScript) {
+                JSVersion jsVersion = JSVERSION_DEFAULT;
+                if (params.Find("version=", PR_TRUE) == 0) {
+                    if (params.Length() != 11 || params[8] != '1' || params[9] != '.')
+                        jsVersion = JSVERSION_UNKNOWN;
+                    else switch (params[10]) {
+                        case '0': jsVersion = JSVERSION_1_0; break;
+                        case '1': jsVersion = JSVERSION_1_1; break;
+                        case '2': jsVersion = JSVERSION_1_2; break;
+                        case '3': jsVersion = JSVERSION_1_3; break;
+                        case '4': jsVersion = JSVERSION_1_4; break;
+                        case '5': jsVersion = JSVERSION_1_5; break;
+                        default:  jsVersion = JSVERSION_UNKNOWN;
+                    }
+                }
+                jsVersionString = JS_VersionToString(jsVersion);
+            }
         }
         else if (key.EqualsIgnoreCase("language")) {
             nsAutoString  lang(aNode.GetValueAt(i));
             nsRDFParserUtils::StripAndConvert(lang);
-            isJavaScript = nsRDFParserUtils::IsJavaScriptLanguage(lang);
+            isJavaScript = nsRDFParserUtils::IsJavaScriptLanguage(lang, &jsVersionString);
         }
     }
   
     // Don't process scripts that aren't JavaScript
     if (isJavaScript) {
-        nsXULPrototypeScript* script = new nsXULPrototypeScript(/* line number */ -1);
+        nsXULPrototypeScript* script = new nsXULPrototypeScript(/* line number */ -1, jsVersionString);
         if (! script)
             return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/content/xul/document/src/nsXULDocument.cpp b/mozilla/content/xul/document/src/nsXULDocument.cpp
index 436f913dd0d..b6a22304105 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.cpp
+++ b/mozilla/content/xul/document/src/nsXULDocument.cpp
@@ -4341,24 +4341,23 @@ nsXULDocument::ResumeWalk()
                 nsXULPrototypeScript* scriptproto =
                     NS_REINTERPRET_CAST(nsXULPrototypeScript*, childproto);
 
-                if (scriptproto->mInlineScript.Length()) {
-                    // An inline script
-                    rv = EvaluateScript(mDocumentURL, scriptproto->mInlineScript, scriptproto->mLineNo);
-                    if (NS_FAILED(rv)) return rv;
-                }
-
                 if (scriptproto->mSrcURI) {
                     // A transcluded script reference; this may
                     // "block" our prototype walk if the script isn't
                     // cached, or the cached copy of the script is
                     // stale and must be reloaded.
                     PRBool blocked;
-                    rv = LoadScript(scriptproto->mSrcURI, &blocked);
+                    rv = LoadScript(scriptproto->mSrcURI, scriptproto->mVersion, &blocked);
                     if (NS_FAILED(rv)) return rv;
 
                     if (blocked)
                         return NS_OK;
                 }
+                else if (scriptproto->mInlineScript.Length()) {
+                    // An inline script
+                    rv = EvaluateScript(mDocumentURL, scriptproto->mInlineScript, scriptproto->mLineNo, scriptproto->mVersion);
+                    if (NS_FAILED(rv)) return rv;
+                }
             }
             break;
             
@@ -4482,7 +4481,7 @@ nsXULDocument::ResumeWalk()
 
 
 nsresult
-nsXULDocument::LoadScript(nsIURI* aURI, PRBool* aBlock)
+nsXULDocument::LoadScript(nsIURI* aURI, const char* aVersion, PRBool* aBlock)
 {
     // Load a transcluded script
     nsresult rv;
@@ -4499,6 +4498,7 @@ nsXULDocument::LoadScript(nsIURI* aURI, PRBool* aBlock)
         // call can get report the right file if there are errors in
         // the script.
         mCurrentScriptURL = aURI;
+        mCurrentScriptLanguageVersion = aVersion;
 
         nsCOMPtr<nsILoadGroup> group = do_QueryReferent(mDocumentLoadGroup);
 
@@ -4524,9 +4524,9 @@ nsXULDocument::LoadScript(nsIURI* aURI, PRBool* aBlock)
 
 nsresult
 nsXULDocument::DoneLoadingScript(nsIUnicharStreamLoader* aLoader,
-                                            nsString& aData,
-                                            void* aRef,
-                                            nsresult aStatus)
+                                 nsString& aData,
+                                 void* aRef,
+                                 nsresult aStatus)
 {
     // This is the completion routine that will be called when a
     // transcluded script completes. Evaluate the script if the load
@@ -4536,7 +4536,8 @@ nsXULDocument::DoneLoadingScript(nsIUnicharStreamLoader* aLoader,
     nsXULDocument* doc = NS_REINTERPRET_CAST(nsXULDocument*, aRef);
 
     if (NS_SUCCEEDED(aStatus)) {
-        rv = doc->EvaluateScript(doc->mCurrentScriptURL, aData, 1);
+        rv = doc->EvaluateScript(doc->mCurrentScriptURL, aData, 1,
+				 doc->mCurrentScriptLanguageVersion);
     }
 
     // balance the addref we added in LoadScript()
@@ -4550,7 +4551,7 @@ nsXULDocument::DoneLoadingScript(nsIUnicharStreamLoader* aLoader,
 
 
 nsresult
-nsXULDocument::EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLineNo)
+nsXULDocument::EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLineNo, const char* aVersion)
 {
     // Evaluate the script text in aScript, whose source is aURL
     // starting at aLineNo.
@@ -4573,8 +4574,8 @@ nsXULDocument::EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLi
 
     nsAutoString result;
     PRBool isUndefined;
-    rv = context->EvaluateString(aScript, urlspec, aLineNo, 
-                                 result, &isUndefined);
+    rv = context->EvaluateString(aScript, nsnull, mDocumentPrincipal, urlspec,
+                                 aLineNo, aVersion, result, &isUndefined);
     return rv;
 }
 
diff --git a/mozilla/content/xul/document/src/nsXULDocument.h b/mozilla/content/xul/document/src/nsXULDocument.h
index e2ccb6090b1..4755ff2ec45 100644
--- a/mozilla/content/xul/document/src/nsXULDocument.h
+++ b/mozilla/content/xul/document/src/nsXULDocument.h
@@ -576,14 +576,14 @@ protected:
      * prototype construction must 'block' until the load has
      * completed, aBlock will be set to true.
      */
-    nsresult LoadScript(nsIURI* aURI, PRBool* aBlock);
+    nsresult LoadScript(nsIURI* aURI, const char* aVersion, PRBool* aBlock);
 
     /**
      * Evaluate the script text in aScript. aURL and aLineNo
      * specify meta-information about the script in order to
      * provide useful error messages.
      */
-    nsresult EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLinenNo);
+    nsresult EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLinenNo, const char* aVersion);
 
     /**
      * Create a delegate content model element from a prototype.
@@ -611,9 +611,13 @@ protected:
                       nsresult aStatus);
 
     /**
-     * The URL of the current transcluded script that is being loaded
+     * The URL of the current transcluded script that is being loaded.
+     * For document.write('<script src="nestedwrite.js"><\/script>') to work,
+     * these need to be in a stack element type, and we need to hold the top
+     * of stack here.
      */
     nsCOMPtr<nsIURI> mCurrentScriptURL;
+    const char* mCurrentScriptLanguageVersion;
 
     /**
      * Create a XUL template builder on the specified node if a 'datasources'
diff --git a/mozilla/dom/public/nsIScriptContext.h b/mozilla/dom/public/nsIScriptContext.h
index 1ae17d69c36..e283909b495 100644
--- a/mozilla/dom/public/nsIScriptContext.h
+++ b/mozilla/dom/public/nsIScriptContext.h
@@ -51,6 +51,7 @@ public:
   NS_IMETHOD EvaluateString(const nsString& aScript,
                             const char *aURL,
                             PRUint32 aLineNo,
+                            const char* aVersion,
                             nsString& aRetValue,
                             PRBool* aIsUndefined) = 0;
 
@@ -75,13 +76,19 @@ public:
                             nsIPrincipal *principal,
                             const char *aURL,
                             PRUint32 aLineNo,
+                            const char* aVersion,
                             nsString& aRetValue,
                             PRBool* aIsUndefined) = 0;
 
+  NS_IMETHOD CompileFunction(void *aObj, nsIAtom *aName,
+                             const nsString& aBody) = 0;
+
   NS_IMETHOD CallFunction(void *aObj, void *aFunction, 
                           PRUint32 argc, void *argv, 
                           PRBool *aBoolResult) = 0;
 
+  NS_IMETHOD SetDefaultLanguageVersion(const char* aVersion) = 0;
+
   /**
    * Return the global object.
    *
diff --git a/mozilla/dom/src/base/nsGlobalWindow.cpp b/mozilla/dom/src/base/nsGlobalWindow.cpp
index 135535639ce..630d97ce223 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.cpp
+++ b/mozilla/dom/src/base/nsGlobalWindow.cpp
@@ -1787,10 +1787,13 @@ GlobalWindowImpl::RunTimeout(nsTimeoutImpl *aTimeout)
         nsAutoString script = JS_GetStringChars(timeout->expr);
         nsAutoString blank = "";
         PRBool isUndefined;
-        rv = mContext->EvaluateString(script, mScriptObject, 
-                                      timeout->principal, 
+        rv = mContext->EvaluateString(script,
+                                      mScriptObject,
+                                      timeout->principal,
                                       timeout->filename,
-                                      timeout->lineno, blank, 
+                                      timeout->lineno,
+                                      timeout->version,
+                                      blank,
                                       &isUndefined);
       } else {
         PRInt64 lateness64;
@@ -1989,6 +1992,17 @@ GlobalWindowImpl::SetTimeoutOrInterval(JSContext *cx,
     }
   }
 
+  const char* filename;
+  if (nsJSUtils::nsGetCallingLocation(cx, &filename, &timeout->lineno)) {
+    timeout->filename = PL_strdup(filename);
+    if (!timeout->filename) {
+      DropTimeout(timeout);
+      return NS_ERROR_OUT_OF_MEMORY;
+    }
+  }
+
+  timeout->version = JS_VersionToString(JS_GetVersion(cx));
+
   // Get principal of currently executing code, save for execution of timeout
   nsresult rv;  
   NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager,
diff --git a/mozilla/dom/src/base/nsGlobalWindow.h b/mozilla/dom/src/base/nsGlobalWindow.h
index 76110a134c6..1326ef29ac2 100644
--- a/mozilla/dom/src/base/nsGlobalWindow.h
+++ b/mozilla/dom/src/base/nsGlobalWindow.h
@@ -304,10 +304,10 @@ struct nsTimeoutImpl {
   PRUint32            public_id;      /* Returned as value of setTimeout() */
   PRInt32             interval;       /* Non-zero if repetitive timeout */
   PRInt64             when;           /* nominal time to run this timeout */
-  JSVersion           version;        /* Version of JavaScript to execute */
-  nsIPrincipal       *principal;    /* principals with which to execute */
+  nsIPrincipal        *principal;     /* principals with which to execute */
   char                *filename;      /* filename of setTimeout call */
   PRUint32            lineno;         /* line number of setTimeout call */
+  const char          *version;       /* JS language version string constant */
   nsTimeoutImpl       *next;
 };
 
diff --git a/mozilla/dom/src/base/nsJSEnvironment.cpp b/mozilla/dom/src/base/nsJSEnvironment.cpp
index 5f03b0e05f6..5d69aa147dc 100644
--- a/mozilla/dom/src/base/nsJSEnvironment.cpp
+++ b/mozilla/dom/src/base/nsJSEnvironment.cpp
@@ -1,21 +1,22 @@
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-*
-* The contents of this file are subject to the Netscape Public License
-* Version 1.0 (the "NPL"); you may not use this file except in
-* compliance with the NPL.  You may obtain a copy of the NPL at
-* http://www.mozilla.org/NPL/
-*
-* Software distributed under the NPL is distributed on an "AS IS" basis,
-* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
-* for the specific language governing rights and limitations under the
-* NPL.
-*
-* The Initial Developer of this code under the NPL is Netscape
-* Communications Corporation.  Portions created by Netscape are
-* Copyright (C) 1998 Netscape Communications Corporation.  All Rights
-* Reserved.
-*/
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
 
+#include <ctype.h>
 #include "nsJSEnvironment.h"
 #include "nsIScriptObjectOwner.h"
 #include "nsIScriptContextOwner.h"
@@ -49,24 +50,19 @@
 
 const size_t gStackSize = 8192;
 
-static NS_DEFINE_IID(kIScriptContextIID, NS_ISCRIPTCONTEXT_IID);
-static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
-static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
-static NS_DEFINE_IID(kIScriptNameSetRegistryIID, NS_ISCRIPTNAMESETREGISTRY_IID);
 static NS_DEFINE_IID(kCScriptNameSetRegistryCID, NS_SCRIPT_NAMESET_REGISTRY_CID);
-static NS_DEFINE_CID(kXPConnectCID,              NS_XPCONNECT_CID);
 
 void PR_CALLBACK
-NS_ScriptErrorReporter(JSContext *cx, 
-                       const char *message, 
+NS_ScriptErrorReporter(JSContext *cx,
+                       const char *message,
                        JSErrorReport *report)
 {
   nsIScriptContext* context = (nsIScriptContext*)JS_GetContextPrivate(cx);
-  nsIScriptContextOwner* owner;
 
   if (context) {
-    nsresult result = context->GetOwner(&owner);
-    if (NS_SUCCEEDED(result) && owner) {
+    nsCOMPtr<nsIScriptContextOwner> owner;
+    nsresult rv = context->GetOwner(getter_AddRefs(owner));
+    if (NS_SUCCEEDED(rv) && owner) {
       const char* error;
       if (message) {
         error = message;
@@ -74,17 +70,16 @@ NS_ScriptErrorReporter(JSContext *cx,
       else {
         error = "<unknown>";
       }
- 
+
       if (report) {
-        owner->ReportScriptError(error, 
-                                 report->filename, 
+        owner->ReportScriptError(error,
+                                 report->filename,
                                  report->lineno,
                                  report->linebuf);
       }
       else {
         owner->ReportScriptError(error, nsnull, 0, nsnull);
       }
-      NS_RELEASE(owner);
     }
   }
 
@@ -93,44 +88,51 @@ NS_ScriptErrorReporter(JSContext *cx,
 
 nsJSContext::nsJSContext(JSRuntime *aRuntime)
 {
-	mRefCnt = 0;
-	mContext = JS_NewContext(aRuntime, gStackSize);
-	JS_SetContextPrivate(mContext, (void *)this);
-	mNameSpaceManager = nsnull;
-	mIsInitialized = PR_FALSE;
-	mNumEvaluations = 0;
+  mRefCnt = 0;
+  mContext = JS_NewContext(aRuntime, gStackSize);
+  if (mContext)
+    JS_SetContextPrivate(mContext, (void *)this);
+  mIsInitialized = PR_FALSE;
+  mNumEvaluations = 0;
   mSecurityManager = nsnull;
   mOwner = nsnull;
   mTerminationFunc = nsnull;
 }
 
+const char kScriptSecurityManagerProgID[] = NS_SCRIPTSECURITYMANAGER_PROGID;
+
 nsJSContext::~nsJSContext()
 {
-	// Tell xpconnect that we're about to destroy the JSContext so it can cleanup
-	nsIXPConnect* xpc;
-	nsresult res;
-	res = nsServiceManager::GetService(kXPConnectCID, nsIXPConnect::GetIID(), 
-		(nsISupports**) &xpc);
-	//NS_ASSERTION(NS_SUCCEEDED(res), "unable to get xpconnect");
-	if (NS_SUCCEEDED(res)) {
-		xpc->AbandonJSContext(mContext);
-		nsServiceManager::ReleaseService(kXPConnectCID, xpc);
-	}
-	
-	NS_IF_RELEASE(mNameSpaceManager);
-	JS_DestroyContext(mContext);
+  if (mSecurityManager) {
+    nsServiceManager::ReleaseService(kScriptSecurityManagerProgID,
+                                     mSecurityManager);
+    mSecurityManager = nsnull;
+  }
+
+  // Cope with JS_NewContext failure in ctor (XXXbe move NewContext to Init?)
+  if (!mContext)
+    return;
+
+  // Tell xpconnect that we're about to destroy the JSContext so it can cleanup
+  nsresult rv;
+  NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
+  if (NS_SUCCEEDED(rv))
+    xpc->AbandonJSContext(mContext);
+
+  JS_DestroyContext(mContext);
 }
 
-NS_IMPL_ISUPPORTS(nsJSContext, kIScriptContextIID);
+NS_IMPL_ISUPPORTS(nsJSContext, NS_GET_IID(nsIScriptContext));
 
 NS_IMETHODIMP
 nsJSContext::EvaluateString(const nsString& aScript,
                             const char *aURL,
                             PRUint32 aLineNo,
+                            const char* aVersion,
                             nsString& aRetValue,
                             PRBool* aIsUndefined)
 {
-  return EvaluateString(aScript, nsnull, nsnull, aURL, aLineNo, aRetValue, aIsUndefined);
+  return EvaluateString(aScript, nsnull, nsnull, aURL, aLineNo, aVersion, aRetValue, aIsUndefined);
 }
 
 NS_IMETHODIMP
@@ -139,273 +141,355 @@ nsJSContext::EvaluateString(const nsString& aScript,
                             nsIPrincipal *principal,
                             const char *aURL,
                             PRUint32 aLineNo,
+                            const char* aVersion,
                             nsString& aRetValue,
                             PRBool* aIsUndefined)
 {
   nsresult rv;
   if (!jsObj)
     jsObj = JS_GetGlobalObject(mContext);
-  NS_WITH_SERVICE(nsIJSContextStack, stack, "nsThreadJSContextStack", &rv);
-  if (NS_FAILED(rv)) 
-    return NS_ERROR_FAILURE;
-  if (NS_FAILED(stack->Push(mContext))) 
-    return NS_ERROR_FAILURE;
+
+  // Safety first: get an object representing the script's principals, i.e.,
+  // the entities who signed this script, or the fully-qualified-domain-name
+  // or "codebase" from which it was loaded.
   JSPrincipals *jsprin;
+  nsCOMPtr<nsIPrincipal> principalCOMPtr = principal;
   if (principal) {
     principal->GetJSPrincipals(&jsprin);
-  } else {
-    // norris TODO: Using GetGlobalObject to get principals is unrelible.
-    nsCOMPtr<nsIScriptGlobalObjectData> globalData;
-    nsCOMPtr<nsIPrincipal> principal;
+  }
+  else {
+    // norris TODO: Using GetGlobalObject to get principals is broken?
     nsCOMPtr<nsIScriptGlobalObject> global = GetGlobalObject();
-    if (!global || NS_FAILED(global->QueryInterface(NS_GET_IID(nsIScriptGlobalObjectData), 
-                                                    (void**) getter_AddRefs(globalData)))) 
-    {
+    if (!global)
       return NS_ERROR_FAILURE;
-    }
-    if (NS_FAILED(globalData->GetPrincipal(getter_AddRefs(principal)))) 
+    nsCOMPtr<nsIScriptGlobalObjectData> globalData = do_QueryInterface(global, &rv);
+    if (NS_FAILED(rv))
       return NS_ERROR_FAILURE;
-    principal->GetJSPrincipals(&jsprin);
+    rv = globalData->GetPrincipal(getter_AddRefs(principalCOMPtr));
+    if (NS_FAILED(rv))
+      return NS_ERROR_FAILURE;
+    principalCOMPtr->GetJSPrincipals(&jsprin);
   }
+  // From here on, we must JSPRINCIPALS_DROP(jsprin) before returning...
+
+  PRBool ok = PR_FALSE;
+  nsCOMPtr<nsIScriptSecurityManager> securityManager;
+  rv = GetSecurityManager(getter_AddRefs(securityManager));
+  if (NS_SUCCEEDED(rv))
+    rv = securityManager->CanExecuteScripts(principalCOMPtr, &ok);
+  if (NS_FAILED(rv)) {
+    JSPRINCIPALS_DROP(mContext, jsprin);
+    return NS_ERROR_FAILURE;
+  }
+
+  // Push our JSContext on the current thread's context stack so JS called
+  // from native code via XPConnect uses the right context.  Do this whether
+  // or not the SecurityManager said "ok", in order to simplify control flow
+  // below where we pop before returning.
+  NS_WITH_SERVICE(nsIJSContextStack, stack, "nsThreadJSContextStack", &rv);
+  if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext))) {
+    JSPRINCIPALS_DROP(mContext, jsprin);
+    return NS_ERROR_FAILURE;
+  }
+
+  // The result of evaluation, used only if there were no errors.  This need
+  // not be a GC root currently, provided we run the GC only from the branch
+  // callback or from ScriptEvaluated.  TODO: use JS_Begin/EndRequest to keep
+  // the GC from racing with JS execution on any thread.
   jsval val;
-  NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                  NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-  if (NS_FAILED(rv)) 
-    return NS_ERROR_FAILURE;
-  PRBool canExecute;
-  if (NS_FAILED(securityManager->CanExecuteScripts(principal, &canExecute)))
-    return NS_ERROR_FAILURE;
-  mRef = 0;
-  mTerminationFunc = nsnull;
-  PRBool ret = PR_FALSE;
-  if (canExecute) {
-    ret = ::JS_EvaluateUCScriptForPrincipals(mContext, 
-                                             (JSObject *)jsObj,
-                                             jsprin,
-                                             (jschar*)aScript.GetUnicode(), 
-                                             aScript.Length(),
-                                             aURL, 
-                                             aLineNo,
-                                             &val);
+
+  if (ok) {
+    JSVersion newVersion;
+
+    // SecurityManager said "ok", but don't execute if aVersion is specified
+    // and unknown.  Do execute with the default version (and avoid thrashing
+    // the context's version) if aVersion is not specified.
+    if (!aVersion ||
+        (newVersion = JS_StringToVersion(aVersion)) != JSVERSION_UNKNOWN) {
+      JSVersion oldVersion;
+
+      if (aVersion)
+        oldVersion = JS_SetVersion(mContext, newVersion);
+      mRef = nsnull;
+      mTerminationFunc = nsnull;
+      ok = ::JS_EvaluateUCScriptForPrincipals(mContext,
+                                              (JSObject *)jsObj,
+                                              jsprin,
+                                              (jschar*)aScript.GetUnicode(),
+                                              aScript.Length(),
+                                              aURL,
+                                              aLineNo,
+                                              &val);
+      if (aVersion)
+        JS_SetVersion(mContext, oldVersion);
+    }
   }
+
+  // Whew!  Finally done with these manually ref-counted things.
   JSPRINCIPALS_DROP(mContext, jsprin);
-  if (ret) {
+
+  // If all went well, convert val to a string (XXXbe unless undefined?).
+  if (ok) {
     *aIsUndefined = JSVAL_IS_VOID(val);
-    JSString* jsstring = JS_ValueToString(mContext, val);   
+    JSString* jsstring = JS_ValueToString(mContext, val);
     aRetValue.SetString(JS_GetStringChars(jsstring));
   }
   else {
     *aIsUndefined = PR_TRUE;
     aRetValue.Truncate();
   }
-	
+
   ScriptEvaluated();
-  
-  if (NS_FAILED(stack->Pop(nsnull))) 
+
+  // Pop here, after JS_ValueToString and any other possible evaluation.
+  if (NS_FAILED(stack->Pop(nsnull)))
+    return NS_ERROR_FAILURE;
+
+  return NS_OK;
+}
+
+const char *gEventArgv[] = {"event"};
+
+NS_IMETHODIMP
+nsJSContext::CompileFunction(void *aObj, nsIAtom *aName, const nsString& aBody)
+{
+  JSPrincipals *jsprin = nsnull;
+
+  nsCOMPtr<nsIScriptGlobalObject> global = getter_AddRefs(GetGlobalObject());
+  if (global) {
+    // XXXbe why the two-step QI? speed up via a new GetGlobalObjectData func?
+    nsCOMPtr<nsIScriptGlobalObjectData> globalData = do_QueryInterface(global);
+    if (globalData) {
+      nsCOMPtr<nsIPrincipal> prin;
+      if (NS_FAILED(globalData->GetPrincipal(getter_AddRefs(prin))))
+        return NS_ERROR_FAILURE;
+      prin->GetJSPrincipals(&jsprin);
+    }
+  }
+
+  // optimized to avoid ns*Str*.h explicit/implicit copying and malloc'ing
+  // even nsCAutoString may call an Append that copy-constructs an nsStr from
+  // a const PRUnichar*
+  const PRUnichar *name;
+  aName->GetUnicode(&name);
+  char c, charName[64];
+  int i = 0;
+
+  do {
+    NS_ASSERTION(name[i] < 128, "non-ASCII DOM function name");
+    c = char(name[i]);
+    NS_ASSERTION(c == '\0' || isalpha(c), "non-alphabetic DOM function name");
+
+    NS_ASSERTION(i < sizeof charName, "overlong DOM function name");
+    charName[i++] = tolower(c);
+  } while (c != '\0');
+
+  JSBool ok = JS_CompileUCFunctionForPrincipals(mContext,
+                                                (JSObject*)aObj, jsprin,
+                                                charName, 1, gEventArgv,
+                                                (jschar*)aBody.GetUnicode(),
+                                                aBody.Length(),
+                                                //XXXbe filename, lineno:
+                                                nsnull, 0)
+              != 0;
+
+  if (jsprin)
+    JSPRINCIPALS_DROP(mContext, jsprin);
+  return ok ? NS_OK : NS_ERROR_FAILURE;
+}
+
+NS_IMETHODIMP
+nsJSContext::CallFunction(void *aObj, void *aFunction, PRUint32 argc,
+                          void *argv, PRBool *aBoolResult)
+{
+  // This one's a lot easier than EvaluateString because we don't have to
+  // hassle with principals: they're already compiled into the JS function.
+  nsresult rv;
+  nsCOMPtr<nsIScriptSecurityManager> securityManager;
+  rv = GetSecurityManager(getter_AddRefs(securityManager));
+  if (NS_FAILED(rv))
+    return NS_ERROR_FAILURE;
+
+  PRBool ok;
+  rv = securityManager->CanExecuteFunction((JSFunction *)aFunction, &ok);
+  if (NS_FAILED(rv))
+    return NS_ERROR_FAILURE;
+
+  NS_WITH_SERVICE(nsIJSContextStack, stack, "nsThreadJSContextStack", &rv);
+  if (NS_FAILED(rv) || NS_FAILED(stack->Push(mContext)))
+    return NS_ERROR_FAILURE;
+
+  mRef = nsnull;
+  mTerminationFunc = nsnull;
+
+  jsval val;
+  if (ok) {
+    ok = JS_CallFunction(mContext, (JSObject *)aObj, (JSFunction *)aFunction,
+                         argc, (jsval *)argv, &val);
+  }
+  *aBoolResult = ok
+                 ? !JSVAL_IS_BOOLEAN(val) || JSVAL_TO_BOOLEAN(val)
+                 : JS_TRUE;
+
+  ScriptEvaluated();
+
+  if (NS_FAILED(stack->Pop(nsnull)))
     return NS_ERROR_FAILURE;
 
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsJSContext::CallFunction(void *aObj, void *aFunction, PRUint32 argc, 
-                          void *argv, PRBool *aBoolResult)
+nsJSContext::SetDefaultLanguageVersion(const char* aVersion)
 {
-  nsresult rv;
-  NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                  NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
-  if (NS_FAILED(rv)) 
-    return NS_ERROR_FAILURE;
-  PRBool canExecute;
-  if (NS_FAILED(securityManager->CanExecuteFunction((JSFunction *)aFunction, 
-                                                    &canExecute)))
-    return NS_ERROR_FAILURE;
-
-  NS_WITH_SERVICE(nsIJSContextStack, stack, "nsThreadJSContextStack", &rv);
-  if (NS_FAILED(rv)) 
-    return NS_ERROR_FAILURE;
-  if (NS_FAILED(stack->Push(mContext))) 
-    return NS_ERROR_FAILURE;
-
-  mRef = 0;
-  mTerminationFunc = nsnull;
-
-  jsval val;
-  PRBool ret = canExecute &&
-               JS_CallFunction(mContext, (JSObject *)aObj, 
-                               (JSFunction *)aFunction, argc, 
-                               (jsval *)argv, &val);
-  *aBoolResult = ret 
-                 ? !JSVAL_IS_BOOLEAN(val) || JSVAL_TO_BOOLEAN(val) 
-                 : JS_TRUE;
-	
-  ScriptEvaluated();
-  
-  if (NS_FAILED(stack->Pop(nsnull))) 
-    return NS_ERROR_FAILURE;
-
+  (void) JS_SetVersion(mContext, JS_StringToVersion(aVersion));
   return NS_OK;
 }
 
-
 NS_IMETHODIMP_(nsIScriptGlobalObject*)
 nsJSContext::GetGlobalObject()
 {
-	JSObject *global = JS_GetGlobalObject(mContext);
-	nsIScriptGlobalObject *script_global = nsnull;
-	
-	if (nsnull != global) {
-		nsISupports* sup = (nsISupports *)JS_GetPrivate(mContext, global);
-		if (nsnull != sup) {
-			sup->QueryInterface(kIScriptGlobalObjectIID, (void**) &script_global);
-		}
-		return script_global;
-	}
-	else {
-		return nsnull;
-	}
+  JSObject *global = JS_GetGlobalObject(mContext);
+  nsIScriptGlobalObject *script_global = nsnull;
+
+  if (nsnull != global) {
+    nsISupports* sup = (nsISupports *)JS_GetPrivate(mContext, global);
+    if (nsnull != sup) {
+      sup->QueryInterface(NS_GET_IID(nsIScriptGlobalObject), (void**) &script_global);
+    }
+    return script_global;
+  }
+  return nsnull;
 }
 
 NS_IMETHODIMP_(void*)
 nsJSContext::GetNativeContext()
 {
-	return (void *)mContext;
+  return (void *)mContext;
 }
 
 
 NS_IMETHODIMP
 nsJSContext::InitContext(nsIScriptGlobalObject *aGlobalObject)
 {
-	nsIScriptObjectOwner *owner;
-	JSObject *global;
-	nsresult res = aGlobalObject->QueryInterface(kIScriptObjectOwnerIID, (void **)&owner);
-	mIsInitialized = PR_FALSE;
-	
-	if (NS_OK == res) {
-		res = owner->GetScriptObject(this, (void **)&global);
-		
-		// init standard classes
-		if ((NS_OK == res) && ::JS_InitStandardClasses(mContext, global)) {
-			JS_SetGlobalObject(mContext, global);
-			res = InitClasses(); // this will complete the global object initialization
-		}
-		
-		NS_RELEASE(owner);
-		
-		if (NS_OK == res) {
-			::JS_SetErrorReporter(mContext, NS_ScriptErrorReporter); 
-		}
-	}
-	
-	return res;
+  if (!mContext)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  nsresult rv;
+  nsCOMPtr<nsIScriptObjectOwner> owner = do_QueryInterface(aGlobalObject, &rv);
+  JSObject *global;
+  mIsInitialized = PR_FALSE;
+
+  if (NS_SUCCEEDED(rv)) {
+    rv = owner->GetScriptObject(this, (void **)&global);
+
+    // init standard classes
+    if (NS_SUCCEEDED(rv) && ::JS_InitStandardClasses(mContext, global)) {
+      JS_SetGlobalObject(mContext, global);
+      rv = InitClasses(); // this will complete the global object initialization
+    }
+
+    if (NS_SUCCEEDED(rv)) {
+      ::JS_SetErrorReporter(mContext, NS_ScriptErrorReporter);
+    }
+  }
+
+  return rv;
 }
 
 nsresult
 nsJSContext::InitializeExternalClasses()
 {
-	nsresult result = NS_OK;
-	
-	nsIScriptNameSetRegistry* registry;
-	result = nsServiceManager::GetService(kCScriptNameSetRegistryCID,
-		kIScriptNameSetRegistryIID,
-		(nsISupports **)&registry);
-	if (NS_OK == result) {
-		result = registry->InitializeClasses(this);
-		nsServiceManager::ReleaseService(kCScriptNameSetRegistryCID,
-			registry);
-	}
-	
-	return result;
+  nsresult rv;
+  NS_WITH_SERVICE(nsIScriptNameSetRegistry, registry, kCScriptNameSetRegistryCID, &rv);
+  if (NS_SUCCEEDED(rv)) {
+    rv = registry->InitializeClasses(this);
+  }
+  return rv;
 }
 
 nsresult
 nsJSContext::InitializeLiveConnectClasses()
 {
 #if defined(OJI)
-	nsresult rv = NS_OK;
-	NS_WITH_SERVICE(nsIJVMManager, jvmManager, nsIJVMManager::GetCID(), &rv);
-	if (rv == NS_OK && jvmManager != nsnull) {
-		PRBool javaEnabled = PR_FALSE;
-		if (NS_OK == jvmManager->IsJavaEnabled(&javaEnabled) && javaEnabled) {
-			nsILiveConnectManager* liveConnectManager = nsnull;
-			if (NS_OK == jvmManager->QueryInterface(nsILiveConnectManager::GetIID(),
-				(void**)&liveConnectManager)) {
-				rv = liveConnectManager->InitLiveConnectClasses(mContext, JS_GetGlobalObject(mContext));
-				NS_RELEASE(liveConnectManager);
-			}
-		}
-	}
+  nsresult rv = NS_OK;
+  NS_WITH_SERVICE(nsIJVMManager, jvmManager, nsIJVMManager::GetCID(), &rv);
+  if (NS_SUCCEEDED(rv) && jvmManager != nsnull) {
+    PRBool javaEnabled = PR_FALSE;
+    if (NS_SUCCEEDED(jvmManager->IsJavaEnabled(&javaEnabled)) && javaEnabled) {
+      nsCOMPtr<nsILiveConnectManager> liveConnectManager = do_QueryInterface(jvmManager);
+      if (liveConnectManager) {
+        rv = liveConnectManager->InitLiveConnectClasses(mContext, JS_GetGlobalObject(mContext));
+      }
+    }
+  }
 #endif
-	
-	// return all is well until things are stable.
-	return NS_OK;
+
+  // return all is well until things are stable.
+  return NS_OK;
 }
 
 NS_IMETHODIMP
 nsJSContext::InitClasses()
 {
-	nsresult res = NS_ERROR_FAILURE;
-	nsIScriptGlobalObject *global = GetGlobalObject();
-	
-	if (NS_OK == NS_InitWindowClass(this, global) &&
-		NS_OK == NS_InitNodeClass(this, nsnull) &&
-		NS_OK == NS_InitElementClass(this, nsnull) &&
-		NS_OK == NS_InitDocumentClass(this, nsnull) &&
-		NS_OK == NS_InitTextClass(this, nsnull) &&
-		NS_OK == NS_InitAttrClass(this, nsnull) &&
-		NS_OK == NS_InitNamedNodeMapClass(this, nsnull) &&
-		NS_OK == NS_InitNodeListClass(this, nsnull) &&
-		NS_OK == InitializeExternalClasses() && 
-		NS_OK == InitializeLiveConnectClasses() &&
-		// XXX Temporarily here. These shouldn't be hardcoded.
-		NS_OK == NS_InitHTMLImageElementClass(this, nsnull) &&
-		NS_OK == NS_InitHTMLOptionElementClass(this, nsnull)) {
-		res = NS_OK;
-	}
-	
-	// Hook up XPConnect
-	{
-		nsIXPConnect* xpc;
-		res = nsServiceManager::GetService(kXPConnectCID, NS_GET_IID(nsIXPConnect), (nsISupports**) &xpc);
-		//NS_ASSERTION(NS_SUCCEEDED(res), "unable to get xpconnect");
-		if (NS_SUCCEEDED(res)) {
-			res = xpc->AddNewComponentsObject(mContext, JS_GetGlobalObject(mContext));
-			NS_ASSERTION(NS_SUCCEEDED(res), "unable to add Components object");
-			nsServiceManager::ReleaseService(kXPConnectCID, xpc);
-		}
-		else {
-			// silently fail for now
-			res = NS_OK;
-		}
-	}
-	mIsInitialized = PR_TRUE;
-	NS_RELEASE(global);
-	return res;
+  nsresult rv = NS_ERROR_FAILURE;
+  nsCOMPtr<nsIScriptGlobalObject> global = dont_AddRef(GetGlobalObject());
+
+  if (NS_OK == NS_InitWindowClass(this, global) &&
+      NS_OK == NS_InitNodeClass(this, nsnull) &&
+      NS_OK == NS_InitElementClass(this, nsnull) &&
+      NS_OK == NS_InitDocumentClass(this, nsnull) &&
+      NS_OK == NS_InitTextClass(this, nsnull) &&
+      NS_OK == NS_InitAttrClass(this, nsnull) &&
+      NS_OK == NS_InitNamedNodeMapClass(this, nsnull) &&
+      NS_OK == NS_InitNodeListClass(this, nsnull) &&
+      NS_OK == InitializeExternalClasses() &&
+      NS_OK == InitializeLiveConnectClasses() &&
+      // XXX Temporarily here. These shouldn't be hardcoded.
+      NS_OK == NS_InitHTMLImageElementClass(this, nsnull) &&
+      NS_OK == NS_InitHTMLOptionElementClass(this, nsnull)) {
+    rv = NS_OK;
+  }
+
+  // Hook up XPConnect
+  {
+    NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
+    if (NS_SUCCEEDED(rv)) {
+      rv = xpc->AddNewComponentsObject(mContext, JS_GetGlobalObject(mContext));
+      NS_ASSERTION(NS_SUCCEEDED(rv), "unable to add Components object");
+    }
+    else {
+      // silently fail for now
+      rv = NS_OK;
+    }
+  }
+  mIsInitialized = PR_TRUE;
+  return rv;
 }
 
-NS_IMETHODIMP     
+NS_IMETHODIMP
 nsJSContext::IsContextInitialized()
 {
-	return (mIsInitialized) ? NS_OK : NS_COMFALSE;
+  return (mIsInitialized) ? NS_OK : NS_COMFALSE;
 }
 
 NS_IMETHODIMP
 nsJSContext::AddNamedReference(void *aSlot, void *aScriptObject, const char *aName)
 {
-	return (::JS_AddNamedRoot(mContext, aSlot, aName)) ? NS_OK : NS_ERROR_FAILURE;
+  return (::JS_AddNamedRoot(mContext, aSlot, aName)) ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
 nsJSContext::RemoveReference(void *aSlot, void *aScriptObject)
 {
-	return (::JS_RemoveRoot(mContext, aSlot)) ? NS_OK : NS_ERROR_FAILURE;
+  return (::JS_RemoveRoot(mContext, aSlot)) ? NS_OK : NS_ERROR_FAILURE;
 }
 
 NS_IMETHODIMP
 nsJSContext::GC()
 {
-	JS_GC(mContext);
-	return NS_OK;
+  JS_GC(mContext);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -413,64 +497,57 @@ nsJSContext::ScriptEvaluated(void)
 {
   if (mTerminationFunc) {
     (*mTerminationFunc)(mRef);
-    mRef = 0;
+    mRef = nsnull;
     mTerminationFunc = nsnull;
   }
 
-	mNumEvaluations++;
-	
-	if (mNumEvaluations > 20) {
-		mNumEvaluations = 0;
-		GC();
-	}
-	
-	return NS_OK;
+  mNumEvaluations++;
+
+  if (mNumEvaluations > 20) {
+    mNumEvaluations = 0;
+    GC();
+  }
+
+  return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsJSContext::GetNameSpaceManager(nsIScriptNameSpaceManager** aInstancePtr)
 {
-	nsresult result = NS_OK;
-	
-	if (nsnull == mNameSpaceManager) {
-		result = NS_NewScriptNameSpaceManager(&mNameSpaceManager);
-		if (NS_OK == result) {
-			nsIScriptNameSetRegistry* registry;
-			result = nsServiceManager::GetService(kCScriptNameSetRegistryCID,
-				kIScriptNameSetRegistryIID,
-				(nsISupports **)&registry);
-			if (NS_OK == result) {
-				result = registry->PopulateNameSpace(this);
-				nsServiceManager::ReleaseService(kCScriptNameSetRegistryCID,
-					registry);
-			}
-		}
-	}
-	
-	*aInstancePtr = mNameSpaceManager;
-	NS_ADDREF(mNameSpaceManager);
-	
-	return result;
+  nsresult rv = NS_OK;
+
+  if (!mNameSpaceManager.get()) {
+    rv = NS_NewScriptNameSpaceManager(getter_AddRefs(mNameSpaceManager));
+    if (NS_SUCCEEDED(rv)) {
+      // XXXbe used progid rather than CID?
+      NS_WITH_SERVICE(nsIScriptNameSetRegistry, registry, kCScriptNameSetRegistryCID, &rv);
+      if (NS_SUCCEEDED(rv)) {
+        rv = registry->PopulateNameSpace(this);
+      }
+    }
+  }
+
+  *aInstancePtr = mNameSpaceManager;
+  NS_ADDREF(*aInstancePtr);
+  return rv;
 }
 
 NS_IMETHODIMP
 nsJSContext::GetSecurityManager(nsIScriptSecurityManager **aInstancePtr)
 {
-    if (!mSecurityManager) {
-        nsresult ret;
-        NS_WITH_SERVICE(nsIScriptSecurityManager, securityManager, 
-                        NS_SCRIPTSECURITYMANAGER_PROGID, &ret);
-        if (NS_FAILED(ret)) 
-            return NS_ERROR_FAILURE;
-        mSecurityManager = securityManager;
-        NS_ADDREF(mSecurityManager);
-    }
-    *aInstancePtr = mSecurityManager;
-    NS_ADDREF(*aInstancePtr);
-    return NS_OK;
+  if (!mSecurityManager) {
+    nsresult rv = nsServiceManager::GetService(kScriptSecurityManagerProgID,
+                                               NS_GET_IID(nsIScriptSecurityManager),
+                                               (nsISupports**)&mSecurityManager);
+    if (NS_FAILED(rv))
+      return NS_ERROR_FAILURE;
+  }
+  *aInstancePtr = mSecurityManager;
+  NS_ADDREF(*aInstancePtr);
+  return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsJSContext::SetOwner(nsIScriptContextOwner* owner)
 {
   // The owner should not be addrefed!! We'll be told
@@ -480,16 +557,16 @@ nsJSContext::SetOwner(nsIScriptContextOwner* owner)
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsJSContext::GetOwner(nsIScriptContextOwner** owner)
 {
   *owner = mOwner;
-  NS_IF_ADDREF(mOwner);
+  NS_IF_ADDREF(*owner);
 
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsJSContext::SetTerminationFunction(nsScriptTerminationFunc aFunc,
                                     nsISupports* aRef)
 {
@@ -504,15 +581,15 @@ nsJSEnvironment *nsJSEnvironment::sTheEnvironment = nsnull;
 // Class to manage destruction of the singleton
 // JSEnvironment
 struct JSEnvironmentInit {
-	JSEnvironmentInit() {
-	}
-	
-	~JSEnvironmentInit() {
-		if (nsJSEnvironment::sTheEnvironment) {
-			delete nsJSEnvironment::sTheEnvironment;
-			nsJSEnvironment::sTheEnvironment = nsnull;
-		}
-	}
+  JSEnvironmentInit() {
+  }
+
+  ~JSEnvironmentInit() {
+    if (nsJSEnvironment::sTheEnvironment) {
+      delete nsJSEnvironment::sTheEnvironment;
+      nsJSEnvironment::sTheEnvironment = nsnull;
+    }
+  }
 };
 
 #ifndef XP_MAC
@@ -522,101 +599,103 @@ static JSEnvironmentInit initJSEnvironment;
 nsJSEnvironment *
 nsJSEnvironment::GetScriptingEnvironment()
 {
-	if (nsnull == sTheEnvironment) {
-		sTheEnvironment = new nsJSEnvironment();
-	}
-	return sTheEnvironment;
+  if (nsnull == sTheEnvironment) {
+    sTheEnvironment = new nsJSEnvironment();
+  }
+  return sTheEnvironment;
 }
 
+const char kJSRuntimeServiceProgID[] = "nsJSRuntimeService";
+
 nsJSEnvironment::nsJSEnvironment()
 {
-  nsresult result;
-
-  NS_WITH_SERVICE(nsIJSRuntimeService, rtsvc, "nsJSRuntimeService", &result);
+  mRuntimeService = nsnull;
+  nsresult rv = nsServiceManager::GetService(kJSRuntimeServiceProgID,
+                                             NS_GET_IID(nsIJSRuntimeService),
+                                             (nsISupports**)&mRuntimeService);
   // get the JSRuntime from the runtime svc, if possible
-  if (NS_FAILED(result))
+  if (NS_FAILED(rv))
     return;                     // XXX swallow error! need Init()?
-  result = rtsvc->GetRuntime(&mRuntime);
-  if (NS_FAILED(result))
+  rv = mRuntimeService->GetRuntime(&mRuntime);
+  if (NS_FAILED(rv))
     return;                     // XXX swallow error! need Init()?
-  	
-#if defined(OJI)
-	// Initialize LiveConnect.
-	nsILiveConnectManager* manager = NULL;
-	result = nsServiceManager::GetService(nsIJVMManager::GetCID(),
-		nsILiveConnectManager::GetIID(),
-		(nsISupports **)&manager);
-	
-	// Should the JVM manager perhaps define methods for starting up LiveConnect?
-	if (result == NS_OK && manager != NULL) {
-		PRBool started = PR_FALSE;
-		result = manager->StartupLiveConnect(mRuntime, started);
-		result = nsServiceManager::ReleaseService(nsIJVMManager::GetCID(), manager);
-	}
-#endif
 
+#if defined(OJI)
+  // Initialize LiveConnect.  XXXbe uses GetCID rather than progid
+  NS_WITH_SERVICE(nsILiveConnectManager, manager,
+                  nsIJVMManager::GetCID(), &rv);
+
+  // Should the JVM manager perhaps define methods for starting up LiveConnect?
+  if (NS_SUCCEEDED(rv) && manager != nsnull) {
+    PRBool started = PR_FALSE;
+    rv = manager->StartupLiveConnect(mRuntime, started);
+  }
+#endif
 }
 
 nsJSEnvironment::~nsJSEnvironment()
 {
+  if (mRuntimeService)
+    nsServiceManager::ReleaseService(kJSRuntimeServiceProgID, mRuntimeService);
 }
 
 nsIScriptContext* nsJSEnvironment::GetNewContext()
 {
-	nsIScriptContext *context;
-	context = new nsJSContext(mRuntime);
-	NS_ADDREF(context);
-	return context;
+  nsIScriptContext *context;
+  context = new nsJSContext(mRuntime);
+  NS_ADDREF(context);
+  return context;
 }
 
 #define XPC_HOOK_VALUE (nsIXPCSecurityManager::HOOK_CREATE_WRAPPER  |   \
                         nsIXPCSecurityManager::HOOK_CREATE_INSTANCE |   \
                         nsIXPCSecurityManager::HOOK_GET_SERVICE)
 
-extern "C" NS_DOM nsresult NS_CreateScriptContext(nsIScriptGlobalObject *aGlobal, 
+extern "C" NS_DOM nsresult NS_CreateScriptContext(nsIScriptGlobalObject *aGlobal,
                                                   nsIScriptContext **aContext)
 {
-	nsresult rv = NS_OK;
-	nsJSEnvironment *environment = nsJSEnvironment::GetScriptingEnvironment();
-	*aContext = environment->GetNewContext();
-	if (! *aContext) return NS_ERROR_OUT_OF_MEMORY; // XXX
-	// Hook up XPConnect
-	nsIXPConnect* xpc;
-	rv = nsServiceManager::GetService(kXPConnectCID, nsIXPConnect::GetIID(), (nsISupports**) &xpc);
-	//NS_ASSERTION(NS_SUCCEEDED(rv), "unable to get xpconnect");
-	if (NS_SUCCEEDED(rv)) {
-		nsIScriptObjectOwner* owner;
-		rv = aGlobal->QueryInterface(nsIScriptObjectOwner::GetIID(), (void**) &owner);
-		if (NS_SUCCEEDED(rv)) {
-			JSObject* global;
-			rv = owner->GetScriptObject(*aContext, (void**) &global);
-			if (NS_SUCCEEDED(rv)) {
-				JSContext *cx = (JSContext*) (*aContext)->GetNativeContext();
-				rv = xpc->InitJSContext(cx, global, JS_FALSE);
-				//NS_ASSERTION(NS_SUCCEEDED(rv), "xpconnect unable to init jscontext");
-				nsIScriptSecurityManager *mgr=NULL;
-				nsIXPCSecurityManager *xpcSecurityManager=NULL;
-				if (NS_SUCCEEDED(rv)) 
-					rv=(*aContext)->GetSecurityManager(&mgr);
-				if (NS_SUCCEEDED(rv))
-					rv = mgr->QueryInterface(nsIXPCSecurityManager::GetIID(), (void**)&xpcSecurityManager);
-	        // Bind the script context and the global object
-	        (*aContext)->InitContext(aGlobal);
-	         aGlobal->SetContext(*aContext);
-				if (NS_SUCCEEDED(rv))
-					xpc->SetSecurityManagerForJSContext(cx, xpcSecurityManager, XPC_HOOK_VALUE);
-			}
-			NS_RELEASE(owner);
-		}
-		nsServiceManager::ReleaseService(kXPConnectCID, xpc);
-	}
-	else {
-	    (*aContext)->InitContext(aGlobal);
-	    aGlobal->SetContext(*aContext);
-        rv = NS_OK;
-	}
-	// XXX silently fail for now
-	//  return rv;
-	return NS_OK;    
+  nsJSEnvironment *environment = nsJSEnvironment::GetScriptingEnvironment();
+  if (!environment)
+    return NS_ERROR_OUT_OF_MEMORY;
+
+  nsIScriptContext *scriptContext = environment->GetNewContext();
+  if (!scriptContext)
+    return NS_ERROR_OUT_OF_MEMORY;
+  *aContext = scriptContext;
+
+  // Hook up XPConnect
+  nsresult rv;
+  NS_WITH_SERVICE(nsIXPConnect, xpc, nsIXPConnect::GetCID(), &rv);
+  if (NS_SUCCEEDED(rv)) {
+    nsCOMPtr<nsIScriptObjectOwner> owner = do_QueryInterface(aGlobal, &rv);
+    if (NS_SUCCEEDED(rv)) {
+      JSObject* global;
+      rv = owner->GetScriptObject(scriptContext, (void**) &global);
+      if (NS_SUCCEEDED(rv)) {
+        // Tell XPConnect about this context
+        JSContext *cx = (JSContext*) scriptContext->GetNativeContext();
+        rv = xpc->InitJSContext(cx, global, JS_FALSE);
+        //NS_ASSERTION(NS_SUCCEEDED(rv), "xpconnect unable to init jscontext");
+
+        // If that succeeded, get a security manager and install it
+        if (NS_SUCCEEDED(rv)) {
+          nsCOMPtr<nsIScriptSecurityManager> mgr;
+          rv = scriptContext->GetSecurityManager(getter_AddRefs(mgr));
+          if (NS_SUCCEEDED(rv)) {
+            nsCOMPtr<nsIXPCSecurityManager> xpcSecurityManager = do_QueryInterface(mgr, &rv);
+            if (NS_SUCCEEDED(rv))
+              xpc->SetSecurityManagerForJSContext(cx, xpcSecurityManager, XPC_HOOK_VALUE);
+          }
+        }
+      }
+    }
+  }
+
+  // Bind the script context and the global object
+  scriptContext->InitContext(aGlobal);
+  aGlobal->SetContext(scriptContext);
+
+  // XXX suppress XPConnect failures for now?
+  return NS_OK;
 }
 
diff --git a/mozilla/dom/src/base/nsJSEnvironment.h b/mozilla/dom/src/base/nsJSEnvironment.h
index b52a85c3822..fc808200317 100644
--- a/mozilla/dom/src/base/nsJSEnvironment.h
+++ b/mozilla/dom/src/base/nsJSEnvironment.h
@@ -19,6 +19,7 @@
 #define nsJSEnvironment_h___
 
 #include "nsIScriptContext.h"
+#include "nsCOMPtr.h"
 #include "jsapi.h"
 #include "nsCOMPtr.h"
 
@@ -29,11 +30,11 @@ class nsIPrincipal;
 class nsJSContext : public nsIScriptContext {
 private:
   JSContext *mContext;
-  nsIScriptNameSpaceManager* mNameSpaceManager;
+  nsCOMPtr<nsIScriptNameSpaceManager> mNameSpaceManager;
   PRBool mIsInitialized;
   PRUint32 mNumEvaluations;
-  nsIScriptSecurityManager *mSecurityManager;
-  nsIScriptContextOwner* mOwner;
+  nsIScriptSecurityManager* mSecurityManager; /* XXXbe nsCOMPtr to service */
+  nsIScriptContextOwner* mOwner;  /* NB: weak reference, not ADDREF'd */
   nsScriptTerminationFunc mTerminationFunc;
   nsCOMPtr<nsISupports> mRef;
   
@@ -46,6 +47,7 @@ public:
   NS_IMETHOD       EvaluateString(const nsString& aScript,
                                   const char *aURL,
                                   PRUint32 aLineNo,
+                                  const char* aVersion,
                                   nsString& aRetValue,
                                   PRBool* aIsUndefined);
   NS_IMETHOD       EvaluateString(const nsString& aScript,
@@ -53,11 +55,15 @@ public:
                                   nsIPrincipal *principal,
                                   const char *aURL,
                                   PRUint32 aLineNo,
+                                  const char* aVersion,
                                   nsString& aRetValue,
                                   PRBool* aIsUndefined);
+  NS_IMETHOD       CompileFunction(void *aObj, nsIAtom *aName,
+                                   const nsString& aBody);
   NS_IMETHOD       CallFunction(void *aObj, void *aFunction, 
                                 PRUint32 argc, void *argv, 
                                 PRBool *aBoolResult);
+  NS_IMETHOD SetDefaultLanguageVersion(const char* aVersion);
   NS_IMETHOD_(nsIScriptGlobalObject*)    GetGlobalObject();
   NS_IMETHOD_(void*)                     GetNativeContext();
   NS_IMETHOD     InitClasses();
@@ -80,9 +86,12 @@ public:
   nsresult InitializeLiveConnectClasses();
 };
 
+class nsIJSRuntimeService;
+
 class nsJSEnvironment {
 private:
   JSRuntime *mRuntime;
+  nsIJSRuntimeService* mRuntimeService; /* XXXbe nsCOMPtr to service */
 
 public:
   static nsJSEnvironment *sTheEnvironment;
diff --git a/mozilla/dom/src/base/nsJSUtils.cpp b/mozilla/dom/src/base/nsJSUtils.cpp
index ae9c82fa453..24803d28867 100644
--- a/mozilla/dom/src/base/nsJSUtils.cpp
+++ b/mozilla/dom/src/base/nsJSUtils.cpp
@@ -73,22 +73,10 @@ nsJSUtils::NameAndFormatForNSResult(nsresult rv,
 }
 
 NS_EXPORT JSBool
-nsJSUtils::nsReportError(JSContext* aContext, 
-                         nsresult aResult,
-                         const char* aMessage)
+nsJSUtils::nsGetCallingLocation(JSContext* aContext,
+                                const char* *aFilename,
+                                PRUint32 *aLineno)
 {
-  const char* name = nsnull;
-  const char* format = nsnull;
-  char* location = nsnull;
-
-  // Get the name and message
-  if (aMessage) {
-    format = aMessage;
-  }
-  else {
-    NameAndFormatForNSResult(aResult, &name, &format);
-  }
-
   // Get the current filename and line number
   JSStackFrame* frame = nsnull;
   JSScript* script = nsnull;
@@ -102,14 +90,40 @@ nsJSUtils::nsReportError(JSContext* aContext,
   if (script) {
     const char* filename = JS_GetScriptFilename(aContext, script);
     if (filename) {
-      PRUint32 lineNo = 0;
+      PRUint32 lineno = 0;
       jsbytecode* bytecode = JS_GetFramePC(aContext, frame);
       if (bytecode) {
-        lineNo = JS_PCToLineNumber(aContext, script, bytecode);
+        lineno = JS_PCToLineNumber(aContext, script, bytecode);
       }
-      location = PR_smprintf("%s Line: %d", filename, lineNo);
+      *aFilename = filename;
+      *aLineno = lineno;
+      return JS_TRUE;
     }
   }
+
+  return JS_FALSE;
+}
+
+NS_EXPORT JSBool
+nsJSUtils::nsReportError(JSContext* aContext, 
+                         nsresult aResult,
+                         const char* aMessage)
+{
+  const char* name = nsnull;
+  const char* format = nsnull;
+
+  // Get the name and message
+  if (!aMessage)
+    NameAndFormatForNSResult(aResult, &name, &format);
+  else
+    format = aMessage;
+
+  const char* filename;
+  PRUint32 lineno;
+  char* location = nsnull;
+
+  if (nsJSUtils::nsGetCallingLocation(aContext, &filename, &lineno))
+    location = PR_smprintf("%s Line: %d", filename, lineno);
   
   nsCOMPtr<nsIDOMDOMException> exc;
   nsresult rv = NS_NewDOMException(getter_AddRefs(exc), 
diff --git a/mozilla/dom/src/base/nsJSUtils.h b/mozilla/dom/src/base/nsJSUtils.h
index 1fa06b6d211..637250aaa57 100644
--- a/mozilla/dom/src/base/nsJSUtils.h
+++ b/mozilla/dom/src/base/nsJSUtils.h
@@ -34,6 +34,9 @@ class nsIDOMEventListener;
 
 class nsJSUtils {
 public:
+  static NS_EXPORT JSBool nsGetCallingLocation(JSContext* aContext,
+                                               const char* *aFilename,
+                                               PRUint32 *aLineno);
 
   static NS_EXPORT JSBool nsReportError(JSContext* aContext, 
                                         nsresult aResult,
diff --git a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
index 030888a62e9..9cad05e50f4 100644
--- a/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
+++ b/mozilla/dom/src/jsurl/nsJSProtocolHandler.cpp
@@ -50,14 +50,13 @@ static NS_DEFINE_CID(kJSProtocolHandlerCID, NS_JSPROTOCOLHANDLER_CID);
 /* nsEvaluateStringProxy                                                   */
 /* This private class will allow us to evaluate js on another thread       */
 /***************************************************************************/
-class nsEvaluateStringProxy : public nsIEvaluateStringProxy
-{
-    public:
-        NS_DECL_ISUPPORTS
-        NS_DECL_NSIEVALUATESTRINGPROXY
-        
-        nsEvaluateStringProxy();
-        virtual ~nsEvaluateStringProxy();
+class nsEvaluateStringProxy : public nsIEvaluateStringProxy {
+  public:
+    NS_DECL_ISUPPORTS
+    NS_DECL_NSIEVALUATESTRINGPROXY
+
+    nsEvaluateStringProxy();
+    virtual ~nsEvaluateStringProxy();
 };
 
 
@@ -73,28 +72,29 @@ nsEvaluateStringProxy::~nsEvaluateStringProxy()
 
 NS_IMPL_ISUPPORTS1(nsEvaluateStringProxy, nsIEvaluateStringProxy)
 
-NS_IMETHODIMP 
-nsEvaluateStringProxy::EvaluateString(nsIScriptContext *scriptContext, 
-                                      const char *script, 
-                                      void * aObj, 
-                                      nsIPrincipal *principal, 
-                                      const char *aURL, 
-                                      PRInt32 aLineNo, 
-                                      char **aRetValue, 
+NS_IMETHODIMP
+nsEvaluateStringProxy::EvaluateString(nsIScriptContext *scriptContext,
+                                      const char *script,
+                                      void * aObj,
+                                      nsIPrincipal *principal,
+                                      const char *aURL,
+                                      PRInt32 aLineNo,
+                                      char **aRetValue,
                                       PRBool *aIsUndefined)
 {
     nsString string;
     nsresult rv;
 
-    rv =   scriptContext->EvaluateString( nsString(script), 
-                                          aObj, 
-                                          principal, 
-                                          aURL, 
-                                          aLineNo, 
-                                          string, 
-                                          aIsUndefined);
+    rv =   scriptContext->EvaluateString(nsString(script),
+                                         aObj,
+                                         principal,
+                                         aURL,
+                                         aLineNo,
+                                         nsnull,
+                                         string,
+                                         aIsUndefined);
+    // XXXbe this should not decimate! pass back UCS-2 to necko
     *aRetValue = string.ToNewCString();
-
     return rv;
 }
 
@@ -208,9 +208,9 @@ nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri,
 {
     NS_ENSURE_ARG_POINTER(uri);
     NS_ENSURE_ARG_POINTER(eventSinkGetter);
-    
+
     nsresult rv;
-    
+
     // The event sink must be a script context owner or we fail.
     nsIScriptContextOwner* ownerPtr;
     rv = eventSinkGetter->GetEventSink(verb,
@@ -220,10 +220,10 @@ nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri,
         return rv;
     nsCOMPtr<nsIScriptContextOwner> owner = ownerPtr;
     NS_RELEASE(ownerPtr);
-    
+
     if (!owner)
         return NS_ERROR_FAILURE;
-    
+
     // So far so good: get the script context from its owner.
     nsCOMPtr<nsIScriptContext> scriptContext;
     rv = owner->GetScriptContext(getter_AddRefs(scriptContext));
@@ -235,7 +235,7 @@ nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri,
                     NS_SCRIPTSECURITYMANAGER_PROGID, &rv);
     if (NS_FAILED(rv))
         return NS_ERROR_FAILURE;
-    
+
     PRBool hasPrincipal;
     if (NS_FAILED(securityManager->HasSubjectPrincipal(&hasPrincipal)))
         return NS_ERROR_FAILURE;
@@ -260,16 +260,16 @@ nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri,
 
     //TODO Change this to GetSpec and then skip past the javascript:
     // Get the expression:
-    
+
     char* str;
     rv = uri->GetPath(&str);
     if (NS_FAILED(rv))
         return rv;
-    
+
     nsString jsExpr(str);
-    
+
     nsCRT::free(str);
-        
+
     // Finally, we have everything needed to evaluate the expression.
     // We do this by proxying back to the main thread.
 
@@ -277,73 +277,66 @@ nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri,
 
     NS_WITH_SERVICE(nsIProxyObjectManager, proxyObjectManager,
                     nsIProxyObjectManager::GetCID(), &rv);
-        
-    if (NS_FAILED(rv)) 
+
+    if (NS_FAILED(rv))
         return rv;
 
     nsIEvaluateStringProxy* evalProxy = nsnull;
     nsEvaluateStringProxy*  eval      = new nsEvaluateStringProxy();
-        
+
     if (eval == nsnull)
         return NS_ERROR_OUT_OF_MEMORY;
-    
+
     rv = proxyObjectManager->GetProxyObject(nsnull,
                                             nsCOMTypeInfo<nsIEvaluateStringProxy>::GetIID(),
                                             NS_STATIC_CAST(nsISupports*, eval),
                                             PROXY_SYNC | PROXY_ALWAYS,
                                             (void**) &evalProxy);
-        
-    if (NS_FAILED(rv))
-    {
+
+    if (NS_FAILED(rv)) {
         NS_RELEASE(eval);
         return rv;
     }
 
     char* retString;
     char* tempString = jsExpr.ToNewCString();
-    if (!tempString)
-    {
+    if (!tempString) {
         NS_RELEASE(eval);
         return NS_ERROR_OUT_OF_MEMORY;
     }
-    
-    rv = evalProxy->EvaluateString(scriptContext, tempString, nsnull, principal, nsnull, 0, &retString, &isUndefined); 
-    
+
+    rv = evalProxy->EvaluateString(scriptContext, tempString, nsnull, principal, nsnull, 0, &retString, &isUndefined);
+
     Recycle(tempString);
 
     NS_RELEASE(evalProxy);
     NS_RELEASE(eval);
 
-    if (NS_FAILED(rv)) 
-    {
+    if (NS_FAILED(rv)) {
         rv = NS_ERROR_MALFORMED_URI;
         return rv;
     }
-    
-    if (isUndefined) 
-    {
+
+    if (isUndefined) {
         strcpy( retString, "" );
     }
 #if 0
-    else
-    {
+    else {
 // This is from the old code which need to be hack on a bit more:
 
-#if 0   // plaintext is apparently busted
+// plaintext is apparently busted
         if (ret[0] != PRUnichar('<'))
             ret.Insert("<plaintext>\n", 0);
-#endif
         mLength = ret.Length();
         PRUint32 resultSize = mLength + 1;
         mResult = (char *)PR_Malloc(resultSize);
         ret.ToCString(mResult, resultSize);
     }
-#endif 
+#endif
 
     NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
-    if (NS_FAILED(rv))
-    {
-        if (retString) 
+    if (NS_FAILED(rv)) {
+        if (retString)
             Recycle(retString);
         return rv;
     }
@@ -352,7 +345,7 @@ nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri,
     rv = NS_NewStringInputStream(getter_AddRefs(s), retString);
     int length = PL_strlen(retString);
     Recycle(retString);
-        
+
     if (NS_FAILED(rv))
         return rv;
 
@@ -367,7 +360,6 @@ nsJSProtocolHandler::NewChannel(const char* verb, nsIURI* uri,
         return rv;
 
     *result = channel;
-
     return rv;
 }
 
@@ -417,7 +409,7 @@ NSRegisterSelf(nsISupports* aServMgr, const char* aPath)
                                     NS_NETWORK_PROTOCOL_PROGID_PREFIX "javascript",
                                     aPath, PR_TRUE, PR_TRUE);
 
-    
+
     return rv;
 }
 
diff --git a/mozilla/editor/base/nsEditorShell.cpp b/mozilla/editor/base/nsEditorShell.cpp
index 58eda0002a6..97d8856a970 100644
--- a/mozilla/editor/base/nsEditorShell.cpp
+++ b/mozilla/editor/base/nsEditorShell.cpp
@@ -3454,6 +3454,7 @@ void nsEditorShell::SetButtonImage(nsIDOMNode * aParentNode, PRInt32 aBtnNum, co
 }
 #endif
 
+// XXXbe why is this needed?  eliminate
 NS_IMETHODIMP    
 nsEditorShell::ExecuteScript(nsIScriptContext * aContext, const nsString& aScript)
 {
@@ -3468,7 +3469,7 @@ nsEditorShell::ExecuteScript(nsIScriptContext * aContext, const nsString& aScrip
     nsCRT::free(script_str);
 #endif
 
-    aContext->EvaluateString(aScript, url, 0, rVal, &isUndefined);
+    aContext->EvaluateString(aScript, url, 0, nsnull, rVal, &isUndefined);
   } 
   return NS_OK;
 }
diff --git a/mozilla/editor/composer/src/nsEditorShell.cpp b/mozilla/editor/composer/src/nsEditorShell.cpp
index 58eda0002a6..97d8856a970 100644
--- a/mozilla/editor/composer/src/nsEditorShell.cpp
+++ b/mozilla/editor/composer/src/nsEditorShell.cpp
@@ -3454,6 +3454,7 @@ void nsEditorShell::SetButtonImage(nsIDOMNode * aParentNode, PRInt32 aBtnNum, co
 }
 #endif
 
+// XXXbe why is this needed?  eliminate
 NS_IMETHODIMP    
 nsEditorShell::ExecuteScript(nsIScriptContext * aContext, const nsString& aScript)
 {
@@ -3468,7 +3469,7 @@ nsEditorShell::ExecuteScript(nsIScriptContext * aContext, const nsString& aScrip
     nsCRT::free(script_str);
 #endif
 
-    aContext->EvaluateString(aScript, url, 0, rVal, &isUndefined);
+    aContext->EvaluateString(aScript, url, 0, nsnull, rVal, &isUndefined);
   } 
   return NS_OK;
 }
diff --git a/mozilla/layout/events/src/nsEventListenerManager.cpp b/mozilla/layout/events/src/nsEventListenerManager.cpp
index e49d14799a1..59f1f7a4a07 100644
--- a/mozilla/layout/events/src/nsEventListenerManager.cpp
+++ b/mozilla/layout/events/src/nsEventListenerManager.cpp
@@ -431,8 +431,6 @@ nsresult nsEventListenerManager::RemoveEventListenerByType(nsIDOMEventListener *
   return NS_OK;
 }
 
-static const char *gEventArgv[] = {"event"};
-
 nsresult nsEventListenerManager::SetJSEventListener(nsIScriptContext *aContext, JSObject *aObject, REFNSIID aIID)
 {
   nsVoidArray *mListeners;
@@ -464,52 +462,19 @@ nsresult
 nsEventListenerManager::AddScriptEventListener(nsIScriptContext* aContext,
                                                nsIScriptObjectOwner *aScriptObjectOwner,
                                                nsIAtom *aName,
-                                               const nsString& aFunc,
+                                               const nsString& aBody,
                                                REFNSIID aIID)
 {
-  JSObject *scriptObject = nsnull;
-  JSPrincipals *jsprin = nsnull;
-
-  nsCOMPtr<nsIScriptGlobalObject> global = getter_AddRefs(aContext->GetGlobalObject());
-  if (global) {
-    // XXXbe why the two-step QI?  speed up via aContext->GetGlobalObjectData?
-    nsCOMPtr<nsIScriptGlobalObjectData> globalData = do_QueryInterface(global);
-    if (globalData) {
-      nsCOMPtr<nsIPrincipal> prin;
-      if (NS_FAILED(globalData->GetPrincipal(getter_AddRefs(prin))))
-        return NS_ERROR_FAILURE;
-      prin->GetJSPrincipals(&jsprin);
-    }
-  }
-
-  JSContext *cx = (JSContext*)aContext->GetNativeContext();
-  nsresult rv = aScriptObjectOwner->GetScriptObject(aContext,
-                                                    (void**)&scriptObject);
-  if (NS_SUCCEEDED(rv)) {
-    nsString name, lowerName;
-    aName->ToString(name);
-    name.ToLowerCase(lowerName);
-    char* charName = lowerName.ToNewCString();
-    if (!charName) {
-      rv = NS_ERROR_OUT_OF_MEMORY;
-    } else {
-      JSBool ok = JS_CompileUCFunctionForPrincipals(cx, scriptObject, jsprin,
-                                                    charName, 1, gEventArgv,
-                                                    (jschar*)aFunc.GetUnicode(),
-                                                    aFunc.Length(),
-                                                    //XXXbe filename, lineno:
-                                                    nsnull, 0)
-                  != 0;
-      nsCRT::free(charName);
-      if (ok)
-        rv = SetJSEventListener(aContext, scriptObject, aIID);
-      else
-        rv = NS_ERROR_OUT_OF_MEMORY;
-    }
-  }
-  if (jsprin)
-    JSPRINCIPALS_DROP(cx, jsprin);
-  return rv;
+  JSObject *scriptObject;
+  nsresult rv;
+  
+  rv = aScriptObjectOwner->GetScriptObject(aContext, (void**)&scriptObject);
+  if (NS_FAILED(rv))
+    return NS_ERROR_FAILURE;
+  rv = aContext->CompileFunction(scriptObject, aName, aBody);
+  if (NS_FAILED(rv))
+    return NS_ERROR_FAILURE;
+  return SetJSEventListener(aContext, scriptObject, aIID);
 }
 
 nsresult nsEventListenerManager::RegisterScriptEventListener(nsIScriptContext *aContext, nsIScriptObjectOwner *aScriptObjectOwner, 
diff --git a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
index c6c04586e86..1dd7a5f9702 100644
--- a/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/layout/html/document/src/nsHTMLContentSink.cpp
@@ -33,6 +33,7 @@
 #include "nsHTMLTokens.h"  
 #include "nsHTMLEntities.h" 
 #include "nsCRT.h"
+#include "jsapi.h" // for JSVERSION_* and JS_VersionToString
 #include "prtime.h"
 #include "prlog.h"
 
@@ -263,7 +264,9 @@ public:
   PRBool   PreEvaluateScript();
   void     PostEvaluateScript(PRBool aBodyPresent);
   nsresult EvaluateScript(nsString& aScript,
-                          PRInt32 aLineNo);
+                          PRInt32 aLineNo,
+                          const char* aVersion);
+  const char* mScriptLanguageVersion;
 
   void UpdateAllContexts();
   void NotifyAppend(nsIContent* aContent, 
@@ -3113,10 +3116,12 @@ static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aPa
   if (-1 != semiIndex) {
     aValue.Left(aType, semiIndex);
     aValue.Right(aParams, (aValue.Length() - semiIndex) - 1);
+    aParams.StripWhitespace();
   }
   else {
     aType = aValue;
   }
+  aType.StripWhitespace();
 }
 
 nsresult
@@ -3415,28 +3420,34 @@ HTMLContentSink::ProcessMETATag(const nsIParserNode& aNode)
 // Returns PR_TRUE if the language name is a version of JavaScript and
 // PR_FALSE otherwise
 static PRBool
-IsJavaScriptLanguage(const nsString& aName)
+IsJavaScriptLanguage(const nsString& aName, const char* *aVersion)
 {
-  if (aName.EqualsIgnoreCase("JavaScript") || 
-      aName.EqualsIgnoreCase("LiveScript") || 
-      aName.EqualsIgnoreCase("Mocha")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.1")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.2")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.3")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.4")) { 
-    return PR_TRUE;
-  } 
-  else { 
+  JSVersion version = JSVERSION_UNKNOWN;
+
+  if (aName.EqualsIgnoreCase("JavaScript") ||
+      aName.EqualsIgnoreCase("LiveScript") ||
+      aName.EqualsIgnoreCase("Mocha")) {
+    version = JSVERSION_DEFAULT;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.1")) {
+    version = JSVERSION_1_1;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.2")) {
+    version = JSVERSION_1_2;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.3")) {
+    version = JSVERSION_1_3;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.4")) {
+    version = JSVERSION_1_4;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.5")) {
+    version = JSVERSION_1_5;
+  }
+  if (version == JSVERSION_UNKNOWN)
     return PR_FALSE;
-  } 
+  *aVersion = JS_VersionToString(version);
+  return PR_TRUE;
 }
 
 #ifdef DEBUG
@@ -3525,7 +3536,8 @@ HTMLContentSink::IsInScript()
 
 nsresult
 HTMLContentSink::EvaluateScript(nsString& aScript,
-                                PRInt32 aLineNo)
+                                PRInt32 aLineNo,
+                                const char* aVersion)
 {
   nsresult rv = NS_OK;
 
@@ -3555,7 +3567,7 @@ HTMLContentSink::EvaluateScript(nsString& aScript,
   
       PRBool isUndefined;
       context->EvaluateString(aScript, nsnull, principal, url, 
-                              aLineNo, ret, &isUndefined);
+                              aLineNo, aVersion, ret, &isUndefined);
       
       if (docURL) {
         NS_RELEASE(docURL);
@@ -3579,11 +3591,10 @@ nsDoneLoadingScript(nsIUnicharStreamLoader* aLoader,
   HTMLContentSink* sink = (HTMLContentSink*)aRef;
 
   if (NS_OK == aStatus) {
-
     PRBool bodyPresent = sink->PreEvaluateScript();
 
     // XXX We have no way of indicating failure. Silently fail?
-    sink->EvaluateScript(aData, 0);
+    sink->EvaluateScript(aData, 0, sink->mScriptLanguageVersion);
 
     sink->PostEvaluateScript(bodyPresent);
   }
@@ -3602,7 +3613,8 @@ nsresult
 HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
 {
   nsresult rv = NS_OK;
-  PRBool   isJavaScript = PR_TRUE;
+  PRBool isJavaScript = PR_TRUE;
+  const char* jsVersionString = nsnull;
   PRInt32 i, ac = aNode.GetAttributeCount();
 
   // Look for SRC attribute and look for a LANGUAGE attribute
@@ -3621,14 +3633,31 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
       nsAutoString  params;
       SplitMimeType(type, mimeType, params);
 
-      isJavaScript = mimeType.EqualsIgnoreCase("text/javascript") || 
-        mimeType.EqualsIgnoreCase("application/x-javascript");
+      isJavaScript = mimeType.EqualsIgnoreCase("application/x-javascript") || 
+                     mimeType.EqualsIgnoreCase("text/javascript");
+      if (isJavaScript) {
+        JSVersion jsVersion = JSVERSION_DEFAULT;
+        if (params.Find("version=", PR_TRUE) == 0) {
+          if (params.Length() != 11 || params[8] != '1' || params[9] != '.')
+            jsVersion = JSVERSION_UNKNOWN;
+          else switch (params[10]) {
+            case '0': jsVersion = JSVERSION_1_0; break;
+            case '1': jsVersion = JSVERSION_1_1; break;
+            case '2': jsVersion = JSVERSION_1_2; break;
+            case '3': jsVersion = JSVERSION_1_3; break;
+            case '4': jsVersion = JSVERSION_1_4; break;
+            case '5': jsVersion = JSVERSION_1_5; break;
+            default:  jsVersion = JSVERSION_UNKNOWN;
+          }
+        }
+        jsVersionString = JS_VersionToString(jsVersion);
+      }
     }
     else if (key.EqualsIgnoreCase("language")) {
       nsAutoString  lang;
        
       GetAttributeValueAt(aNode, i, lang, nsnull);
-      isJavaScript = IsJavaScriptLanguage(lang);
+      isJavaScript = IsJavaScriptLanguage(lang, &jsVersionString);
     }
   }
 
@@ -3695,6 +3724,8 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
   // Don't process scripts that aren't JavaScript and don't process
   // scripts that are inside iframes
   if (isJavaScript && !mNumOpenIFRAMES) {
+    mScriptLanguageVersion = jsVersionString;
+
     // If there is a SRC attribute...
     if (src.Length() > 0) {
       // Use the SRC attribute value to load the URL
@@ -3729,7 +3760,7 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
 
       PRUint32 lineNo = (PRUint32)aNode.GetSourceLineNumber();
 
-      EvaluateScript(script, lineNo);
+      EvaluateScript(script, lineNo, jsVersionString);
 
       PostEvaluateScript(bodyPresent);
 
diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
index 302aa1daaeb..dab8146fe10 100644
--- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp
@@ -42,8 +42,8 @@
 #include "nsIDOMComment.h"
 #include "nsIDOMCDATASection.h"
 #include "nsIHTMLContent.h"
-#include "nsHTMLEntities.h" 
-#include "nsHTMLParts.h" 
+#include "nsHTMLEntities.h"
+#include "nsHTMLParts.h"
 #include "nsVoidArray.h"
 #include "nsCRT.h"
 #include "nsICSSLoader.h"
@@ -56,6 +56,7 @@
 #include "nsINameSpace.h"
 #include "nsINameSpaceManager.h"
 #include "nsIContentViewer.h"
+#include "jsapi.h" // for JSVERSION_* and JS_VersionToString
 #include "prtime.h"
 #include "prlog.h"
 #include "prmem.h"
@@ -71,7 +72,7 @@
 #endif
 
 // XXX misnamed header file, but oh well
-#include "nsHTMLTokens.h"  
+#include "nsHTMLTokens.h"
 
 static char kNameSpaceSeparator = ':';
 static char kNameSpaceDef[] = "xmlns";
@@ -194,7 +195,7 @@ nsXMLContentSink::~nsXMLContentSink()
     PR_FREEIF(mText);
   }
   NS_IF_RELEASE(mCSSLoader);
-#ifdef XSL  
+#ifdef XSL
   NS_IF_RELEASE(mXSLTransformMediator);
 #endif
 }
@@ -257,12 +258,12 @@ nsXMLContentSink::QueryInterface(REFNSIID aIID, void** aInstancePtr)
     *aInstancePtr = (void*)(nsIXMLContentSink*)this;
     NS_ADDREF_THIS();
     return NS_OK;
-  }    
+  }
   if (aIID.Equals(kIObserverIID)) {
     *aInstancePtr = (void*)(nsIObserver*)this;
     NS_ADDREF_THIS();
     return NS_OK;
-  }  
+  }
   if (aIID.Equals(kISupportsIID)) {
     *aInstancePtr = (void*)(nsISupports*)(nsIXMLContentSink*)this;
     NS_ADDREF_THIS();
@@ -274,7 +275,7 @@ nsXMLContentSink::QueryInterface(REFNSIID aIID, void** aInstancePtr)
 #endif
 
   // nsIContentSink
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::WillBuildModel(void)
 {
   // Notify document that the load is beginning
@@ -282,7 +283,7 @@ nsXMLContentSink::WillBuildModel(void)
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
 {
   // XXX this is silly; who cares?
@@ -303,8 +304,8 @@ nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
 #else
   nsresult rv;
   if (mXSLTransformMediator) {
-    rv = SetupTransformMediator();  
-  } 
+    rv = SetupTransformMediator();
+  }
 
   if (!mXSLTransformMediator || NS_FAILED(rv)) {
     mDocument->SetRootContent(mDocElement);
@@ -319,7 +320,7 @@ nsXMLContentSink::DidBuildModel(PRInt32 aQualityLevel)
   return NS_OK;
 }
 
-void 
+void
 nsXMLContentSink::StartLayoutProcess()
 {
   StartLayout();
@@ -353,13 +354,13 @@ nsXMLContentSink::Observe(nsISupports *aSubject, const PRUnichar *aTopic, const
 
   // Reset the observer on the transform mediator
   mXSLTransformMediator->SetTransformObserver(nsnull);
-  
+
   return rv;
 }
 
 
 // Provide the transform mediator with the source document's content
-// model and the output document, and register the XML content sink 
+// model and the output document, and register the XML content sink
 // as the transform observer.  The transform mediator will call
 // the nsIObserver::Observe() method on the transform observer once
 // the transform is completed.  The nsISupports pointer to the Observe
@@ -388,13 +389,13 @@ nsXMLContentSink::SetupTransformMediator()
 }
 #endif
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::WillInterrupt(void)
 {
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::WillResume(void)
 {
   return NS_OK;
@@ -406,7 +407,7 @@ nsXMLContentSink::SetParser(nsIParser* aParser)
   NS_IF_RELEASE(mParser);
   mParser = aParser;
   NS_IF_ADDREF(mParser);
-  
+
   return NS_OK;
 }
 
@@ -437,11 +438,11 @@ nsXMLContentSink::GetAttributeValueAt(const nsIParserNode& aNode,
 
   if (mParser) {
     nsCOMPtr<nsIDTD> dtd;
-    
+
     nsresult rv = mParser->GetDTD(getter_AddRefs(dtd));
-    
+
     if (NS_SUCCEEDED(rv)) {
-      
+
       // Reduce any entities
       // XXX Note: as coded today, this will only convert well formed
       // entities.  This may not be compatible enough.
@@ -488,7 +489,7 @@ nsXMLContentSink::GetAttributeValueAt(const nsIParserNode& aNode,
             if (ch > 65535) {
               continue;
             }
-        
+
             // Remove entity from string and replace it with the integer
             // value.
             aResult.Cut(start, index - start);
@@ -576,7 +577,7 @@ nsXMLContentSink::AddAttributes(const nsIParserNode& aNode,
     }
 
     nsAutoString value;
-    if (NS_CONTENT_ATTR_NOT_THERE == 
+    if (NS_CONTENT_ATTR_NOT_THERE ==
         aContent->GetAttribute(nameSpaceID, nameAtom, value)) {
       // Get value and remove mandatory quotes
       GetAttributeValueAt(aNode, i, v);
@@ -638,7 +639,7 @@ nsXMLContentSink::PushNameSpacesFrom(const nsIParserNode& aNode)
 
         // Get the attribute value (the URI for the namespace)
         GetAttributeValueAt(aNode, i, uri);
-      
+
         // Open a local namespace
         nsIAtom* prefixAtom = ((0 < prefix.Length()) ? NS_NewAtom(prefix) : nsnull);
         nsINameSpace* child = nsnull;
@@ -671,7 +672,7 @@ nsIAtom*  nsXMLContentSink::CutNameSpacePrefix(nsString& aString)
   return nsnull;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
 {
   nsresult result = NS_OK;
@@ -739,10 +740,10 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
         mDocElement = content;
         NS_ADDREF(mDocElement);
 
-        // For XSL, we need to wait till after the transform 
+        // For XSL, we need to wait till after the transform
         // to set the root content object.  Hence, the following
         // ifndef.
-#ifndef XSL         
+#ifndef XSL
         mDocument->SetRootContent(mDocElement);
 #endif
       }
@@ -760,7 +761,7 @@ nsXMLContentSink::OpenContainer(const nsIParserNode& aNode)
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
 {
   nsresult result = NS_OK;
@@ -810,7 +811,7 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
   nsINameSpace* nameSpace = PopNameSpaces();
   if (nsnull != content) {
     nsIXMLContent* xmlContent;
-    if (NS_OK == content->QueryInterface(kIXMLContentIID, 
+    if (NS_OK == content->QueryInterface(kIXMLContentIID,
                                          (void **)&xmlContent)) {
       xmlContent->SetContainingNameSpace(nameSpace);
       NS_RELEASE(xmlContent);
@@ -821,7 +822,7 @@ nsXMLContentSink::CloseContainer(const nsIParserNode& aNode)
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddLeaf(const nsIParserNode& aNode)
 {
   // XXX For now, all leaf content is character data
@@ -862,7 +863,7 @@ nsXMLContentSink::AddLeaf(const nsIParserNode& aNode)
 }
 
 nsresult nsXMLContentSink::CreateErrorText(const nsParserError* aError, nsString& aErrorString)
-{    
+{
   nsString errorText("XML Parsing Error: ");
 
   if (aError) {
@@ -873,14 +874,14 @@ nsresult nsXMLContentSink::CreateErrorText(const nsParserError* aError, nsString
     errorText.Append(aError->colNumber, 10);
     errorText.Append(":");
   }
-  
+
   aErrorString = errorText;
-  
+
   return NS_OK;
 }
 
 nsresult nsXMLContentSink::CreateSourceText(const nsParserError* aError, nsString& aSourceString)
-{  
+{
   nsString sourceText;
   PRInt32 errorPosition = aError->colNumber;
 
@@ -924,11 +925,11 @@ static void SetTextStringOnTextNode(const nsString& aTextString, nsIContent* aTe
  */
 NS_IMETHODIMP
 nsXMLContentSink::NotifyError(const nsParserError* aError)
-{  
+{
   nsresult result = NS_OK;
   nsAutoString parserErrorTag = "parsererror";
   nsAutoString sourceTextTag = "sourcetext";
-  nsString errorText;  
+  nsString errorText;
   nsString sourceText;
   nsIHTMLContent* errorContainerNode = nsnull;
   nsIHTMLContent* sourceContainerNode = nsnull;
@@ -937,9 +938,9 @@ nsXMLContentSink::NotifyError(const nsParserError* aError)
 
   /* Create container and text content nodes */
   result = NS_CreateHTMLElement(&errorContainerNode, parserErrorTag); // XXX these should NOT be in the HTML namespace
-  if (NS_OK == result) {  
+  if (NS_OK == result) {
     result = NS_NewTextNode(&errorTextNode);
-    if (NS_OK == result) {    
+    if (NS_OK == result) {
       result = NS_CreateHTMLElement(&sourceContainerNode, sourceTextTag);
       if (NS_OK == result) {
         result = NS_NewTextNode(&sourceTextNode);
@@ -978,12 +979,12 @@ nsXMLContentSink::NotifyError(const nsParserError* aError)
     errorContainerNode->AppendChildTo(sourceContainerNode, PR_FALSE);
     sourceContainerNode->AppendChildTo(sourceTextNode, PR_FALSE);
   }
-  
+
   return result;
 }
 
 // nsIXMLContentSink
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddXMLDecl(const nsIParserNode& aNode)
 {
   // XXX We'll ignore it for now
@@ -993,27 +994,27 @@ nsXMLContentSink::AddXMLDecl(const nsIParserNode& aNode)
 
 nsresult
 nsXMLContentSink::AddContentAsLeaf(nsIContent *aContent)
-{      
+{
   nsresult result = NS_OK;
 
   if (eXMLContentSinkState_InProlog == mState) {
     result = mDocument->AppendToProlog(aContent);
   }
-  else if (eXMLContentSinkState_InEpilog == mState) {   
+  else if (eXMLContentSinkState_InEpilog == mState) {
     result = mDocument->AppendToEpilog(aContent);
   }
   else {
     nsIContent *parent = GetCurrentContent();
-    
+
     if (nsnull != parent) {
       result = parent->AppendChildTo(aContent, PR_FALSE);
     }
   }
-  
+
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddComment(const nsIParserNode& aNode)
 {
   FlushText();
@@ -1040,7 +1041,7 @@ nsXMLContentSink::AddComment(const nsIParserNode& aNode)
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddCDATASection(const nsIParserNode& aNode)
 {
   FlushText();
@@ -1069,7 +1070,7 @@ nsXMLContentSink::AddCDATASection(const nsIParserNode& aNode)
 
 
 static nsresult
-GetQuotedAttributeValue(nsString& aSource, 
+GetQuotedAttributeValue(nsString& aSource,
                         const nsString& aAttribute,
                         nsString& aValue)
 {
@@ -1086,9 +1087,9 @@ GetQuotedAttributeValue(nsString& aSource,
       endOffset = aSource.FindChar(kQuote,PR_FALSE, ++offset);
     }
     else if (kApostrophe == next) {
-      endOffset = aSource.FindChar(kApostrophe, PR_FALSE,++offset);	  
+      endOffset = aSource.FindChar(kApostrophe, PR_FALSE,++offset);
     }
-  
+
     if (-1 != endOffset) {
       aSource.Mid(aValue, offset, endOffset-offset);
     }
@@ -1129,15 +1130,17 @@ static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aPa
   if (-1 != semiIndex) {
     aValue.Left(aType, semiIndex);
     aValue.Right(aParams, (aValue.Length() - semiIndex) - 1);
+    aParams.StripWhitespace();
   }
   else {
     aType = aValue;
   }
+  aType.StripWhitespace();
 }
 
 #ifdef XSL
 nsresult
-nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl, 
+nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
                                       const nsAutoString& aHref)
 {
   nsresult result = NS_OK;
@@ -1146,7 +1149,7 @@ nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
 #else
   nsAutoString absURL;
   nsIURI* docURL = mDocument->GetDocumentURL();
-  nsILoadGroup* LoadGroup; 
+  nsILoadGroup* LoadGroup;
 
   result = docURL->GetLoadGroup(&LoadGroup);
 
@@ -1170,7 +1173,7 @@ nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
 // the XSL stylesheet located at the given URL.
 nsresult
 nsXMLContentSink::LoadXSLStyleSheet(nsIURI* aUrl, const nsString& aType)
-{  
+{
   nsresult rv = NS_OK;
   nsCOMPtr<nsIParser> parser;
 
@@ -1178,9 +1181,9 @@ nsXMLContentSink::LoadXSLStyleSheet(nsIURI* aUrl, const nsString& aType)
   static NS_DEFINE_IID(kCParserCID, NS_PARSER_IID);
 
   // Create the XML parser
-  rv = nsComponentManager::CreateInstance(kCParserCID, 
-                                    nsnull, 
-                                    kCParserIID, 
+  rv = nsComponentManager::CreateInstance(kCParserCID,
+                                    nsnull,
+                                    kCParserIID,
                                     getter_AddRefs(parser));
 
   if (NS_FAILED(rv)) return rv;
@@ -1189,28 +1192,28 @@ nsXMLContentSink::LoadXSLStyleSheet(nsIURI* aUrl, const nsString& aType)
   rv = NS_NewTransformMediator(&mXSLTransformMediator, aType);
   if (NS_FAILED(rv)) return rv;
 
-    
+
   // Enable the transform mediator. It will start the transform
   // as soon as it has enough state to do so.  The state needed is
   // the source content model, the style content model, the current
-  // document, and an observer.  The XML and XSL content sinks provide 
+  // document, and an observer.  The XML and XSL content sinks provide
   // this state by calling the various setters on nsITransformMediator.
   mXSLTransformMediator->SetEnabled(PR_TRUE);
 
   // The XML document owns the transform mediator.  Give the mediator to
   // the XML document.
   nsCOMPtr<nsIXMLDocument> xmlDoc;
-  rv = mDocument->QueryInterface(kIXMLDocumentIID, (void**) getter_AddRefs(xmlDoc));  
+  rv = mDocument->QueryInterface(kIXMLDocumentIID, (void**) getter_AddRefs(xmlDoc));
   if (NS_FAILED(rv)) return rv;
   xmlDoc->SetTransformMediator(mXSLTransformMediator);
 
   // Create the XSL content sink
   nsCOMPtr<nsIXMLContentSink> sink;
   rv = NS_NewXSLContentSink(getter_AddRefs(sink), mXSLTransformMediator, mDocument, aUrl, mWebShell);
-  if (NS_FAILED(rv)) return rv;  
-              
+  if (NS_FAILED(rv)) return rv;
+
   // Hook up the content sink to the parser's output and ask the parser
-  // to start parsing the URL specified by aURL.   
+  // to start parsing the URL specified by aURL.
   parser->SetContentSink(sink);
   nsAutoString utf8("UTF-8");
   mDocument->SetDocumentCharacterSet(utf8);
@@ -1220,9 +1223,9 @@ nsXMLContentSink::LoadXSLStyleSheet(nsIURI* aUrl, const nsString& aType)
   // Set the parser as the stream listener and start the URL load
   nsCOMPtr<nsIStreamListener> sl;
   rv = mParser->QueryInterface(kIStreamListenerIID, (void**)getter_AddRefs(sl));
-  if (NS_FAILED(rv)) return rv; 
-  
-  rv = NS_OpenURI(sl, nsnull, aUrl);  
+  if (NS_FAILED(rv)) return rv;
+
+  rv = NS_OpenURI(sl, nsnull, aUrl);
 
   return rv;
 }
@@ -1251,13 +1254,13 @@ nsXMLContentSink::ProcessXSLStyleLink(nsIContent* aElement,
 {
   nsresult rv = NS_OK;
   nsIURI* url;
-  
+
   rv = CreateStyleSheetURL(&url, aHref);
   if (NS_SUCCEEDED(rv)) {
     rv = LoadXSLStyleSheet(url, aType);
     NS_RELEASE(url);
   }
-  
+
   return rv;
 }
 #endif
@@ -1316,7 +1319,7 @@ nsXMLContentSink::ProcessCSSStyleLink(nsIContent* aElement,
 
     PRBool doneLoading;
     result = mCSSLoader->LoadStyleLink(aElement, url, aTitle, aMedia, kNameSpaceID_Unknown,
-                                       mStyleSheetCount++, 
+                                       mStyleSheetCount++,
                                       ((blockParser) ? mParser : nsnull),
                                       doneLoading);
     NS_RELEASE(url);
@@ -1327,7 +1330,7 @@ nsXMLContentSink::ProcessCSSStyleLink(nsIContent* aElement,
   return result;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
 {
   nsresult result = NS_OK;
@@ -1346,7 +1349,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
 
   if (NS_OK == result) {
     nsAutoString type, href, title, media, alternate;
-    
+
     // If it's a stylesheet PI...
     if (target.EqualsIgnoreCase(kStyleSheetPI)) {
       result = GetQuotedAttributeValue(text, "href", href);
@@ -1355,7 +1358,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
       if ((NS_OK != result) || (0 == href.Length())) {
         return result;
       }
-      
+
       result = GetQuotedAttributeValue(text, "type", type);
       if (NS_OK != result) {
         return result;
@@ -1374,7 +1377,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
       if (NS_OK != result) {
         return result;
       }
-#ifndef XSL      
+#ifndef XSL
       result = ProcessCSSStyleLink(node, href, alternate.Equals("yes"),
                                 title, type, media);
 #else
@@ -1388,7 +1391,7 @@ nsXMLContentSink::AddProcessingInstruction(const nsIParserNode& aNode)
 }
 
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddDocTypeDecl(const nsIParserNode& aNode, PRInt32 aMode)
 {
   printf("nsXMLContentSink::AddDocTypeDecl\n");
@@ -1407,7 +1410,7 @@ nsXMLContentSink::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
       if (NS_OK == rv) {
         // Set the content's document
         content->SetDocument(mDocument, PR_FALSE);
-        
+
         // Set the text in the text node
         static NS_DEFINE_IID(kITextContentIID, NS_ITEXT_CONTENT_IID);
         nsITextContent* text = nsnull;
@@ -1416,7 +1419,7 @@ nsXMLContentSink::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
         NS_RELEASE(text);
 
         // Add text to its parent
-        AddContentAsLeaf(content);      
+        AddContentAsLeaf(content);
         NS_RELEASE(content);
       }
     }
@@ -1431,7 +1434,7 @@ nsXMLContentSink::FlushText(PRBool aCreateTextNode, PRBool* aDidFlush)
 
 #define NS_ACCUMULATION_BUFFER_SIZE 4096
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddCharacterData(const nsIParserNode& aNode)
 {
   return AddText(aNode.GetText());
@@ -1486,28 +1489,28 @@ nsXMLContentSink::AddText(const nsString& aString)
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddUnparsedEntity(const nsIParserNode& aNode)
 {
   printf("nsXMLContentSink::AddUnparsedEntity\n");
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddNotation(const nsIParserNode& aNode)
 {
   printf("nsXMLContentSink::AddNotation\n");
   return NS_OK;
 }
 
-NS_IMETHODIMP 
+NS_IMETHODIMP
 nsXMLContentSink::AddEntityReference(const nsIParserNode& aNode)
 {
   printf("nsXMLContentSink::AddEntityReference\n");
   return NS_OK;
 }
 
-PRInt32 
+PRInt32
 nsXMLContentSink::GetNameSpaceId(nsIAtom* aPrefix)
 {
   PRInt32 id = (nsnull == aPrefix) ? kNameSpaceID_None : kNameSpaceID_Unknown;
@@ -1520,7 +1523,7 @@ nsXMLContentSink::GetNameSpaceId(nsIAtom* aPrefix)
   return id;
 }
 
-nsINameSpace*    
+nsINameSpace*
 nsXMLContentSink::PopNameSpaces()
 {
   if ((nsnull != mNameSpaceStack) && (0 < mNameSpaceStack->Count())) {
@@ -1533,13 +1536,13 @@ nsXMLContentSink::PopNameSpaces()
   return nsnull;
 }
 
-PRBool  
+PRBool
 nsXMLContentSink::IsHTMLNameSpace(PRInt32 aID)
 {
   return PRBool(kNameSpaceID_HTML == aID);
 }
 
-nsIContent* 
+nsIContent*
 nsXMLContentSink::GetCurrentContent()
 {
   if (nsnull != mContentStack) {
@@ -1549,17 +1552,17 @@ nsXMLContentSink::GetCurrentContent()
   return nsnull;
 }
 
-PRInt32 
+PRInt32
 nsXMLContentSink::PushContent(nsIContent *aContent)
 {
   if (nsnull == mContentStack) {
     mContentStack = new nsVoidArray();
   }
-  
+
   mContentStack->AppendElement((void *)aContent);
   return mContentStack->Count();
 }
- 
+
 nsIContent*
 nsXMLContentSink::PopContent()
 {
@@ -1571,7 +1574,7 @@ nsXMLContentSink::PopContent()
   }
   return content;
 }
- 
+
 void
 nsXMLContentSink::StartLayout()
 {
@@ -1666,12 +1669,12 @@ nsXMLContentSink::ResumeParsing()
   if (nsnull != mParser) {
     mParser->EnableParser(PR_TRUE);
   }
-  
+
   return NS_OK;
 }
 
 NS_IMETHODIMP
-nsXMLContentSink::EvaluateScript(nsString& aScript, PRUint32 aLineNo)
+nsXMLContentSink::EvaluateScript(nsString& aScript, PRUint32 aLineNo, const char* aVersion)
 {
   nsresult rv = NS_OK;
 
@@ -1680,13 +1683,13 @@ nsXMLContentSink::EvaluateScript(nsString& aScript, PRUint32 aLineNo)
     nsIScriptContext *context;
     owner = mDocument->GetScriptContextOwner();
     if (nsnull != owner) {
-      
+
       rv = owner->GetScriptContext(&context);
       if (rv != NS_OK) {
         NS_RELEASE(owner);
         return rv;
       }
-        
+
       nsIURI* docURL = mDocument->GetDocumentURL();
 #ifdef NECKO
       char* url;
@@ -1701,11 +1704,11 @@ nsXMLContentSink::EvaluateScript(nsString& aScript, PRUint32 aLineNo)
         nsAutoString val;
         PRBool isUndefined;
 
-        (void) context->EvaluateString(aScript, url, aLineNo, 
+        (void) context->EvaluateString(aScript, url, aLineNo, aVersion,
                                        val, &isUndefined);
-      
+
         NS_IF_RELEASE(docURL);
-      
+
         NS_RELEASE(context);
         NS_RELEASE(owner);
 #ifdef NECKO
@@ -1725,7 +1728,7 @@ nsXMLContentSink::ProcessEndSCRIPTTag(const nsIParserNode& aNode)
   if (mInScript) {
     nsAutoString script;
     script.SetString(mText, mTextLength);
-    result = EvaluateScript(script, mScriptLineNo);
+    result = EvaluateScript(script, mScriptLineNo, mScriptLanguageVersion);
     FlushText(PR_FALSE);
     mInScript = PR_FALSE;
   }
@@ -1736,31 +1739,38 @@ nsXMLContentSink::ProcessEndSCRIPTTag(const nsIParserNode& aNode)
 #define SCRIPT_BUF_SIZE 1024
 
 // XXX Stolen from nsHTMLContentSink. Needs to be shared.
+// XXXbe share also with nsRDFParserUtils.cpp and nsHTMLContentSink.cpp
 // Returns PR_TRUE if the language name is a version of JavaScript and
 // PR_FALSE otherwise
 static PRBool
-IsJavaScriptLanguage(const nsString& aName)
+IsJavaScriptLanguage(const nsString& aName, const char* *aVersion)
 {
-  if (aName.EqualsIgnoreCase("JavaScript") || 
-      aName.EqualsIgnoreCase("LiveScript") || 
-      aName.EqualsIgnoreCase("Mocha")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.1")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.2")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.3")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.4")) { 
-    return PR_TRUE;
-  } 
-  else { 
+  JSVersion version = JSVERSION_UNKNOWN;
+
+  if (aName.EqualsIgnoreCase("JavaScript") ||
+      aName.EqualsIgnoreCase("LiveScript") ||
+      aName.EqualsIgnoreCase("Mocha")) {
+    version = JSVERSION_DEFAULT;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.1")) {
+    version = JSVERSION_1_1;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.2")) {
+    version = JSVERSION_1_2;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.3")) {
+    version = JSVERSION_1_3;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.4")) {
+    version = JSVERSION_1_4;
+  }
+  else if (aName.EqualsIgnoreCase("JavaScript1.5")) {
+    version = JSVERSION_1_5;
+  }
+  if (version == JSVERSION_UNKNOWN)
     return PR_FALSE;
-  } 
+  *aVersion = JS_VersionToString(version);
+  return PR_TRUE;
 }
 
 static void
@@ -1773,7 +1783,7 @@ nsDoneLoadingScript(nsIUnicharStreamLoader* aLoader,
 
   if (NS_OK == aStatus) {
     // XXX We have no way of indicating failure. Silently fail?
-    sink->EvaluateScript(aData, 0);
+    sink->EvaluateScript(aData, 0, sink->mScriptLanguageVersion);
   }
 
   sink->ResumeParsing();
@@ -1790,7 +1800,8 @@ nsresult
 nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
 {
   nsresult rv = NS_OK;
-  PRBool   isJavaScript = PR_TRUE;
+  PRBool isJavaScript = PR_TRUE;
+  const char* jsVersionString = nsnull;
   PRInt32 i, ac = aNode.GetAttributeCount();
 
   // Look for SRC attribute and look for a LANGUAGE attribute
@@ -1802,25 +1813,42 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
     }
     else if (key.EqualsIgnoreCase("type")) {
       nsAutoString  type;
-      
+
       GetAttributeValueAt(aNode, i, type);
       nsAutoString  mimeType;
       nsAutoString  params;
       SplitMimeType(type, mimeType, params);
 
       isJavaScript = mimeType.EqualsIgnoreCase("text/javascript");
+      if (isJavaScript) {
+        JSVersion jsVersion = JSVERSION_DEFAULT;
+        if (params.Find("version=", PR_TRUE) == 0) {
+          if (params.Length() != 11 || params[8] != '1' || params[9] != '.')
+            jsVersion = JSVERSION_UNKNOWN;
+          else switch (params[10]) {
+            case '0': jsVersion = JSVERSION_1_0; break;
+            case '1': jsVersion = JSVERSION_1_1; break;
+            case '2': jsVersion = JSVERSION_1_2; break;
+            case '3': jsVersion = JSVERSION_1_3; break;
+            case '4': jsVersion = JSVERSION_1_4; break;
+            case '5': jsVersion = JSVERSION_1_5; break;
+            default:  jsVersion = JSVERSION_UNKNOWN;
+          }
+        }
+        jsVersionString = JS_VersionToString(jsVersion);
+      }
     }
     else if (key.EqualsIgnoreCase("language")) {
       nsAutoString  lang;
-      
+
       GetAttributeValueAt(aNode, i, lang);
-      isJavaScript = IsJavaScriptLanguage(lang);
+      isJavaScript = IsJavaScriptLanguage(lang, &jsVersionString);
     }
   }
-  
+
   // Don't process scripts that aren't JavaScript
   if (isJavaScript) {
-    nsAutoString script;
+    mScriptLanguageVersion = jsVersionString;
 
     // If there is a SRC attribute...
     if (src.Length() > 0) {
@@ -1856,9 +1884,9 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
 
       mDocument->GetDocumentLoadGroup(getter_AddRefs(loadGroup));
       rv = NS_NewUnicharStreamLoader(&loader,
-                                     url, 
+                                     url,
                                      loadGroup,
-                                     (nsStreamCompleteFunc)nsDoneLoadingScript, 
+                                     (nsStreamCompleteFunc)nsDoneLoadingScript,
                                      (void *)this);
       NS_RELEASE(url);
       if (NS_OK == rv) {
@@ -1888,7 +1916,7 @@ nsXMLContentSink::RefreshIfEnabled(nsIViewManager* vm)
       if (enabled) {
         vm->EnableRefresh();
       }
-      NS_RELEASE(contentViewer); 
+      NS_RELEASE(contentViewer);
     }
   }
   return NS_OK;
diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.h b/mozilla/layout/xml/document/src/nsXMLContentSink.h
index c0f1f6563c0..3c213189e1f 100644
--- a/mozilla/layout/xml/document/src/nsXMLContentSink.h
+++ b/mozilla/layout/xml/document/src/nsXMLContentSink.h
@@ -95,7 +95,8 @@ public:
 #endif
 
   NS_IMETHOD ResumeParsing();
-  NS_IMETHOD EvaluateScript(nsString& aScript, PRUint32 aLineNo);
+  NS_IMETHOD EvaluateScript(nsString& aScript, PRUint32 aLineNo, const char* aVersion);
+  const char* mScriptLanguageVersion;
 
 protected:
   void StartLayout();
diff --git a/mozilla/modules/libpref/src/nsPref.cpp b/mozilla/modules/libpref/src/nsPref.cpp
index f8c2818d274..9e6cd2a0b06 100644
--- a/mozilla/modules/libpref/src/nsPref.cpp
+++ b/mozilla/modules/libpref/src/nsPref.cpp
@@ -280,7 +280,7 @@ NS_IMETHODIMP nsPref::StartUp()
         /* MLM - need a global object for set version call now. */
         JS_SetGlobalObject(gMochaContext, gGlobalConfigObject);
 
-        JS_SetVersion(gMochaContext, JSVERSION_1_2);
+        JS_SetVersion(gMochaContext, JSVERSION_1_5);
 
         if (!JS_InitStandardClasses(gMochaContext, 
                         gGlobalConfigObject))
diff --git a/mozilla/modules/libpref/src/prefapi.c b/mozilla/modules/libpref/src/prefapi.c
index 50f1d3282d7..820fda7cac7 100644
--- a/mozilla/modules/libpref/src/prefapi.c
+++ b/mozilla/modules/libpref/src/prefapi.c
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
@@ -366,12 +366,12 @@ PR_IMPLEMENT(PRBool) PREF_Init(const char *filename)
 {
     PRBool ok = PR_TRUE;
 
-	/* --ML hash test */
-	if (!gHashTable)
-	gHashTable = PR_NewHashTable(2048, PR_HashString, PR_CompareStrings,
-		PR_CompareValues, &pref_HashAllocOps, NULL);
-	if (!gHashTable)
-		return PR_FALSE;
+    /* --ML hash test */
+    if (!gHashTable)
+    gHashTable = PR_NewHashTable(2048, PR_HashString, PR_CompareStrings,
+            PR_CompareValues, &pref_HashAllocOps, NULL);
+    if (!gHashTable)
+        return PR_FALSE;
 
 #ifdef PREF_SUPPORT_OLD_PATH_STRINGS
     if (filename)
@@ -383,77 +383,76 @@ PR_IMPLEMENT(PRBool) PREF_Init(const char *filename)
 #endif /* PREF_SUPPORT_OLD_PATH_STRINGS */
 
     if (!gMochaTaskState)
-		gMochaTaskState = JS_Init((PRUint32) 0xffffffffL);
+        gMochaTaskState = JS_Init((PRUint32) 0xffffffffL);
 
     if (!gMochaContext)
     {
-		gMochaContext = JS_NewContext(gMochaTaskState, 8192);  /* ???? What size? */
-		if (!gMochaContext)
-			return PR_FALSE;
+        gMochaContext = JS_NewContext(gMochaTaskState, 8192);  /* ???? What size? */
+        if (!gMochaContext)
+                return PR_FALSE;
 
-		JS_BeginRequest(gMochaContext);
+        JS_BeginRequest(gMochaContext);
 
-		gGlobalConfigObject = JS_NewObject(gMochaContext, &global_class, NULL, NULL);
-		if (!gGlobalConfigObject)
-		{
-		    JS_EndRequest(gMochaContext);
-		    return PR_FALSE;
+        gGlobalConfigObject = JS_NewObject(gMochaContext, &global_class, NULL, NULL);
+        if (!gGlobalConfigObject)
+        {
+            JS_EndRequest(gMochaContext);
+            return PR_FALSE;
         }
 
         /* MLM - need a global object for set version call now. */
         JS_SetGlobalObject(gMochaContext, gGlobalConfigObject);
 
-		JS_SetVersion(gMochaContext, JSVERSION_1_2);
+        JS_SetVersion(gMochaContext, JSVERSION_1_5);
 
-		if (!JS_InitStandardClasses(gMochaContext, 
-					    gGlobalConfigObject))
-	   {
-		    JS_EndRequest(gMochaContext);
-		    return PR_FALSE;
-	 	}
+        if (!JS_InitStandardClasses(gMochaContext, gGlobalConfigObject))
+        {
+            JS_EndRequest(gMochaContext);
+            return PR_FALSE;
+        }
 
-		JS_SetBranchCallback(gMochaContext, pref_BranchCallback);
-		JS_SetErrorReporter(gMochaContext, NULL);
+        JS_SetBranchCallback(gMochaContext, pref_BranchCallback);
+        JS_SetErrorReporter(gMochaContext, NULL);
 
-		gMochaPrefObject = JS_DefineObject(gMochaContext, 
-						    gGlobalConfigObject, 
-						    "PrefConfig",
-						    &autoconf_class, 
-						    NULL, 
-						    JSPROP_ENUMERATE|JSPROP_READONLY);
-		
-		if (gMochaPrefObject)
-		{
-		    if (!JS_DefineProperties(gMochaContext,
-					     gMochaPrefObject,
-					     autoconf_props))
-		    {
-		        JS_EndRequest(gMochaContext);
-			    return PR_FALSE;
-		    }
-		    if (!JS_DefineFunctions(gMochaContext,
-					    gMochaPrefObject,
-					    autoconf_methods))
-		    {
-		        JS_EndRequest(gMochaContext);
-			    return PR_FALSE;
-		    }
-		}
+        gMochaPrefObject = JS_DefineObject(gMochaContext, 
+                                            gGlobalConfigObject, 
+                                            "PrefConfig",
+                                            &autoconf_class, 
+                                            NULL, 
+                                            JSPROP_ENUMERATE|JSPROP_READONLY);
+        
+        if (gMochaPrefObject)
+        {
+            if (!JS_DefineProperties(gMochaContext,
+                                     gMochaPrefObject,
+                                     autoconf_props))
+            {
+                JS_EndRequest(gMochaContext);
+                    return PR_FALSE;
+            }
+            if (!JS_DefineFunctions(gMochaContext,
+                                    gMochaPrefObject,
+                                    autoconf_methods))
+            {
+                JS_EndRequest(gMochaContext);
+                    return PR_FALSE;
+            }
+        }
 
-		ok = pref_InitInitialObjects();
-	}
-	else 
-	    JS_BeginRequest(gMochaContext);
+        ok = pref_InitInitialObjects();
+    }
+    else 
+        JS_BeginRequest(gMochaContext);
 
 #ifdef PREF_SUPPORT_OLD_PATH_STRINGS
-	if (ok && gFileName)
-	    ok = (PRBool)(pref_OpenFile(gFileName, PR_TRUE, PR_FALSE, PR_FALSE, PR_TRUE) == PREF_NOERROR);
-	else
+    if (ok && gFileName)
+        ok = (PRBool)(pref_OpenFile(gFileName, PR_TRUE, PR_FALSE, PR_FALSE, PR_TRUE) == PREF_NOERROR);
+    else
 #endif /* PREF_SUPPORT_OLD_PATH_STRINGS */
-	if (!ok)
-		gErrorOpeningUserPrefs = PR_TRUE;
-	JS_EndRequest(gMochaContext);
-	return ok;
+    if (!ok)
+        gErrorOpeningUserPrefs = PR_TRUE;
+    JS_EndRequest(gMochaContext);
+    return ok;
 } /*PREF_Init*/
 
 PR_IMPLEMENT(PrefResult)
diff --git a/mozilla/modules/libpref/src/prefapi.cpp b/mozilla/modules/libpref/src/prefapi.cpp
index 50f1d3282d7..820fda7cac7 100644
--- a/mozilla/modules/libpref/src/prefapi.cpp
+++ b/mozilla/modules/libpref/src/prefapi.cpp
@@ -1,4 +1,4 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * The contents of this file are subject to the Netscape Public License
  * Version 1.0 (the "NPL"); you may not use this file except in
@@ -366,12 +366,12 @@ PR_IMPLEMENT(PRBool) PREF_Init(const char *filename)
 {
     PRBool ok = PR_TRUE;
 
-	/* --ML hash test */
-	if (!gHashTable)
-	gHashTable = PR_NewHashTable(2048, PR_HashString, PR_CompareStrings,
-		PR_CompareValues, &pref_HashAllocOps, NULL);
-	if (!gHashTable)
-		return PR_FALSE;
+    /* --ML hash test */
+    if (!gHashTable)
+    gHashTable = PR_NewHashTable(2048, PR_HashString, PR_CompareStrings,
+            PR_CompareValues, &pref_HashAllocOps, NULL);
+    if (!gHashTable)
+        return PR_FALSE;
 
 #ifdef PREF_SUPPORT_OLD_PATH_STRINGS
     if (filename)
@@ -383,77 +383,76 @@ PR_IMPLEMENT(PRBool) PREF_Init(const char *filename)
 #endif /* PREF_SUPPORT_OLD_PATH_STRINGS */
 
     if (!gMochaTaskState)
-		gMochaTaskState = JS_Init((PRUint32) 0xffffffffL);
+        gMochaTaskState = JS_Init((PRUint32) 0xffffffffL);
 
     if (!gMochaContext)
     {
-		gMochaContext = JS_NewContext(gMochaTaskState, 8192);  /* ???? What size? */
-		if (!gMochaContext)
-			return PR_FALSE;
+        gMochaContext = JS_NewContext(gMochaTaskState, 8192);  /* ???? What size? */
+        if (!gMochaContext)
+                return PR_FALSE;
 
-		JS_BeginRequest(gMochaContext);
+        JS_BeginRequest(gMochaContext);
 
-		gGlobalConfigObject = JS_NewObject(gMochaContext, &global_class, NULL, NULL);
-		if (!gGlobalConfigObject)
-		{
-		    JS_EndRequest(gMochaContext);
-		    return PR_FALSE;
+        gGlobalConfigObject = JS_NewObject(gMochaContext, &global_class, NULL, NULL);
+        if (!gGlobalConfigObject)
+        {
+            JS_EndRequest(gMochaContext);
+            return PR_FALSE;
         }
 
         /* MLM - need a global object for set version call now. */
         JS_SetGlobalObject(gMochaContext, gGlobalConfigObject);
 
-		JS_SetVersion(gMochaContext, JSVERSION_1_2);
+        JS_SetVersion(gMochaContext, JSVERSION_1_5);
 
-		if (!JS_InitStandardClasses(gMochaContext, 
-					    gGlobalConfigObject))
-	   {
-		    JS_EndRequest(gMochaContext);
-		    return PR_FALSE;
-	 	}
+        if (!JS_InitStandardClasses(gMochaContext, gGlobalConfigObject))
+        {
+            JS_EndRequest(gMochaContext);
+            return PR_FALSE;
+        }
 
-		JS_SetBranchCallback(gMochaContext, pref_BranchCallback);
-		JS_SetErrorReporter(gMochaContext, NULL);
+        JS_SetBranchCallback(gMochaContext, pref_BranchCallback);
+        JS_SetErrorReporter(gMochaContext, NULL);
 
-		gMochaPrefObject = JS_DefineObject(gMochaContext, 
-						    gGlobalConfigObject, 
-						    "PrefConfig",
-						    &autoconf_class, 
-						    NULL, 
-						    JSPROP_ENUMERATE|JSPROP_READONLY);
-		
-		if (gMochaPrefObject)
-		{
-		    if (!JS_DefineProperties(gMochaContext,
-					     gMochaPrefObject,
-					     autoconf_props))
-		    {
-		        JS_EndRequest(gMochaContext);
-			    return PR_FALSE;
-		    }
-		    if (!JS_DefineFunctions(gMochaContext,
-					    gMochaPrefObject,
-					    autoconf_methods))
-		    {
-		        JS_EndRequest(gMochaContext);
-			    return PR_FALSE;
-		    }
-		}
+        gMochaPrefObject = JS_DefineObject(gMochaContext, 
+                                            gGlobalConfigObject, 
+                                            "PrefConfig",
+                                            &autoconf_class, 
+                                            NULL, 
+                                            JSPROP_ENUMERATE|JSPROP_READONLY);
+        
+        if (gMochaPrefObject)
+        {
+            if (!JS_DefineProperties(gMochaContext,
+                                     gMochaPrefObject,
+                                     autoconf_props))
+            {
+                JS_EndRequest(gMochaContext);
+                    return PR_FALSE;
+            }
+            if (!JS_DefineFunctions(gMochaContext,
+                                    gMochaPrefObject,
+                                    autoconf_methods))
+            {
+                JS_EndRequest(gMochaContext);
+                    return PR_FALSE;
+            }
+        }
 
-		ok = pref_InitInitialObjects();
-	}
-	else 
-	    JS_BeginRequest(gMochaContext);
+        ok = pref_InitInitialObjects();
+    }
+    else 
+        JS_BeginRequest(gMochaContext);
 
 #ifdef PREF_SUPPORT_OLD_PATH_STRINGS
-	if (ok && gFileName)
-	    ok = (PRBool)(pref_OpenFile(gFileName, PR_TRUE, PR_FALSE, PR_FALSE, PR_TRUE) == PREF_NOERROR);
-	else
+    if (ok && gFileName)
+        ok = (PRBool)(pref_OpenFile(gFileName, PR_TRUE, PR_FALSE, PR_FALSE, PR_TRUE) == PREF_NOERROR);
+    else
 #endif /* PREF_SUPPORT_OLD_PATH_STRINGS */
-	if (!ok)
-		gErrorOpeningUserPrefs = PR_TRUE;
-	JS_EndRequest(gMochaContext);
-	return ok;
+    if (!ok)
+        gErrorOpeningUserPrefs = PR_TRUE;
+    JS_EndRequest(gMochaContext);
+    return ok;
 } /*PREF_Init*/
 
 PR_IMPLEMENT(PrefResult)
diff --git a/mozilla/rdf/base/src/nsRDFParserUtils.cpp b/mozilla/rdf/base/src/nsRDFParserUtils.cpp
index 18b98b5f959..83012bf4b4b 100644
--- a/mozilla/rdf/base/src/nsRDFParserUtils.cpp
+++ b/mozilla/rdf/base/src/nsRDFParserUtils.cpp
@@ -31,6 +31,7 @@
 #include "nsIURL.h"
 #include "nsString.h"
 #include "nsRDFParserUtils.h"
+#include "jsapi.h" // for JSVERSION_* and JS_VersionToString
 
 // XXX This totally sucks. I wish that mozilla/base had this code.
 PRUnichar
@@ -197,7 +198,7 @@ nsRDFParserUtils::StripAndConvert(nsString& aResult)
 }
 
 nsresult
-nsRDFParserUtils::GetQuotedAttributeValue(const nsString& aSource, 
+nsRDFParserUtils::GetQuotedAttributeValue(const nsString& aSource,
                                           const nsString& aAttribute,
                                           nsString& aValue)
 {
@@ -217,9 +218,9 @@ static const char kApostrophe = '\'';
             endOffset = aSource.FindChar(kQuote, PR_FALSE,++offset);
         }
         else if (kApostrophe == next) {
-            endOffset = aSource.FindChar(kApostrophe, PR_FALSE,++offset);	  
+            endOffset = aSource.FindChar(kApostrophe, PR_FALSE,++offset);
         }
-  
+
         if (-1 != endOffset) {
             aSource.Mid(aValue, offset, endOffset-offset);
         }
@@ -237,26 +238,32 @@ static const char kApostrophe = '\'';
 
 
 PRBool
-nsRDFParserUtils::IsJavaScriptLanguage(const nsString& aName)
+nsRDFParserUtils::IsJavaScriptLanguage(const nsString& aName, const char* *aVersion)
 {
-  if (aName.EqualsIgnoreCase("JavaScript") || 
-      aName.EqualsIgnoreCase("LiveScript") || 
-      aName.EqualsIgnoreCase("Mocha")) { 
+    JSVersion version = JSVERSION_UNKNOWN;
+
+    if (aName.EqualsIgnoreCase("JavaScript") ||
+        aName.EqualsIgnoreCase("LiveScript") ||
+        aName.EqualsIgnoreCase("Mocha")) {
+        version = JSVERSION_DEFAULT;
+    }
+    else if (aName.EqualsIgnoreCase("JavaScript1.1")) {
+        version = JSVERSION_1_1;
+    }
+    else if (aName.EqualsIgnoreCase("JavaScript1.2")) {
+        version = JSVERSION_1_2;
+    }
+    else if (aName.EqualsIgnoreCase("JavaScript1.3")) {
+        version = JSVERSION_1_3;
+    }
+    else if (aName.EqualsIgnoreCase("JavaScript1.4")) {
+        version = JSVERSION_1_4;
+    }
+    else if (aName.EqualsIgnoreCase("JavaScript1.5")) {
+        version = JSVERSION_1_5;
+    }
+    if (version == JSVERSION_UNKNOWN)
+        return PR_FALSE;
+    *aVersion = JS_VersionToString(version);
     return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.1")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.2")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.3")) { 
-    return PR_TRUE;
-  } 
-  else if (aName.EqualsIgnoreCase("JavaScript1.4")) { 
-    return PR_TRUE;
-  } 
-  else { 
-    return PR_FALSE;
-  } 
 }
diff --git a/mozilla/rdf/base/src/nsRDFParserUtils.h b/mozilla/rdf/base/src/nsRDFParserUtils.h
index c9af6ae0a4e..4bc11020fac 100644
--- a/mozilla/rdf/base/src/nsRDFParserUtils.h
+++ b/mozilla/rdf/base/src/nsRDFParserUtils.h
@@ -28,7 +28,7 @@
 #define nsRDFParserUtils_h__
 
 #include "nscore.h"
-#include "nsError.h"
+#include "jspubtd.h"
 class nsIURI;
 class nsString;
 
@@ -41,14 +41,13 @@ public:
     StripAndConvert(nsString& aResult);
 
     static nsresult
-    GetQuotedAttributeValue(const nsString& aSource, 
+    GetQuotedAttributeValue(const nsString& aSource,
                             const nsString& aAttribute,
                             nsString& aValue);
 
 
     static PRBool
-    IsJavaScriptLanguage(const nsString& aName);
-
+    IsJavaScriptLanguage(const nsString& aName, const char* *aVersion);
 };
 
 
diff --git a/mozilla/rdf/build/dlldeps.cpp b/mozilla/rdf/build/dlldeps.cpp
index 94c9b85f3ba..abac062288a 100644
--- a/mozilla/rdf/build/dlldeps.cpp
+++ b/mozilla/rdf/build/dlldeps.cpp
@@ -26,12 +26,13 @@ void XXXNeverCalled()
 {
     nsAutoString s;
     nsCAutoString cs;
+    int v;
 
     // nsRDFParserUtils
     nsRDFParserUtils::EntityToUnicode("");
     nsRDFParserUtils::StripAndConvert(s);
     nsRDFParserUtils::GetQuotedAttributeValue(s, s, s);
-    nsRDFParserUtils::IsJavaScriptLanguage(s);
+    nsRDFParserUtils::IsJavaScriptLanguage(s, &v);
 
     // rdfutils
     rdf_MakeRelativeRef(s, s);
diff --git a/mozilla/rdf/content/src/nsXULContentSink.cpp b/mozilla/rdf/content/src/nsXULContentSink.cpp
index 495fefdb852..a60c0984061 100644
--- a/mozilla/rdf/content/src/nsXULContentSink.cpp
+++ b/mozilla/rdf/content/src/nsXULContentSink.cpp
@@ -82,6 +82,7 @@
 #include "prlog.h"
 #include "prmem.h"
 #include "rdfutil.h"
+#include "jspubtd.h"            // for JSVERSION_*
 
 #include "nsHTMLTokens.h" // XXX so we can use nsIParserNode::GetTokenType()
 
@@ -801,10 +802,12 @@ static void SplitMimeType(const nsString& aValue, nsString& aType, nsString& aPa
   if (-1 != semiIndex) {
     aValue.Left(aType, semiIndex);
     aValue.Right(aParams, (aValue.Length() - semiIndex) - 1);
+    aParams.StripWhitespace();
   }
   else {
     aType = aValue;
   }
+  aType.StripWhitespace();
 }
 
 
@@ -1516,6 +1519,7 @@ XULContentSinkImpl::OpenScript(const nsIParserNode& aNode)
 {
     nsresult rv = NS_OK;
     PRBool isJavaScript = PR_TRUE;
+    const char* jsVersionString = nsnull;
     PRInt32 ac = aNode.GetAttributeCount();
 
     // Look for SRC attribute and look for a LANGUAGE attribute
@@ -1534,17 +1538,34 @@ XULContentSinkImpl::OpenScript(const nsIParserNode& aNode)
             SplitMimeType(type, mimeType, params);
 
             isJavaScript = mimeType.EqualsIgnoreCase("text/javascript");
+            if (isJavaScript) {
+                JSVersion jsVersion = JSVERSION_DEFAULT;
+                if (params.Find("version=", PR_TRUE) == 0) {
+                    if (params.Length() != 11 || params[8] != '1' || params[9] != '.')
+                        jsVersion = JSVERSION_UNKNOWN;
+                    else switch (params[10]) {
+                        case '0': jsVersion = JSVERSION_1_0; break;
+                        case '1': jsVersion = JSVERSION_1_1; break;
+                        case '2': jsVersion = JSVERSION_1_2; break;
+                        case '3': jsVersion = JSVERSION_1_3; break;
+                        case '4': jsVersion = JSVERSION_1_4; break;
+                        case '5': jsVersion = JSVERSION_1_5; break;
+                        default:  jsVersion = JSVERSION_UNKNOWN;
+                    }
+                }
+                jsVersionString = JS_VersionToString(jsVersion);
+            }
         }
         else if (key.EqualsIgnoreCase("language")) {
             nsAutoString  lang(aNode.GetValueAt(i));
             nsRDFParserUtils::StripAndConvert(lang);
-            isJavaScript = nsRDFParserUtils::IsJavaScriptLanguage(lang);
+            isJavaScript = nsRDFParserUtils::IsJavaScriptLanguage(lang, &jsVersionString);
         }
     }
   
     // Don't process scripts that aren't JavaScript
     if (isJavaScript) {
-        nsXULPrototypeScript* script = new nsXULPrototypeScript(/* line number */ -1);
+        nsXULPrototypeScript* script = new nsXULPrototypeScript(/* line number */ -1, jsVersionString);
         if (! script)
             return NS_ERROR_OUT_OF_MEMORY;
 
diff --git a/mozilla/rdf/content/src/nsXULDocument.cpp b/mozilla/rdf/content/src/nsXULDocument.cpp
index 436f913dd0d..b6a22304105 100644
--- a/mozilla/rdf/content/src/nsXULDocument.cpp
+++ b/mozilla/rdf/content/src/nsXULDocument.cpp
@@ -4341,24 +4341,23 @@ nsXULDocument::ResumeWalk()
                 nsXULPrototypeScript* scriptproto =
                     NS_REINTERPRET_CAST(nsXULPrototypeScript*, childproto);
 
-                if (scriptproto->mInlineScript.Length()) {
-                    // An inline script
-                    rv = EvaluateScript(mDocumentURL, scriptproto->mInlineScript, scriptproto->mLineNo);
-                    if (NS_FAILED(rv)) return rv;
-                }
-
                 if (scriptproto->mSrcURI) {
                     // A transcluded script reference; this may
                     // "block" our prototype walk if the script isn't
                     // cached, or the cached copy of the script is
                     // stale and must be reloaded.
                     PRBool blocked;
-                    rv = LoadScript(scriptproto->mSrcURI, &blocked);
+                    rv = LoadScript(scriptproto->mSrcURI, scriptproto->mVersion, &blocked);
                     if (NS_FAILED(rv)) return rv;
 
                     if (blocked)
                         return NS_OK;
                 }
+                else if (scriptproto->mInlineScript.Length()) {
+                    // An inline script
+                    rv = EvaluateScript(mDocumentURL, scriptproto->mInlineScript, scriptproto->mLineNo, scriptproto->mVersion);
+                    if (NS_FAILED(rv)) return rv;
+                }
             }
             break;
             
@@ -4482,7 +4481,7 @@ nsXULDocument::ResumeWalk()
 
 
 nsresult
-nsXULDocument::LoadScript(nsIURI* aURI, PRBool* aBlock)
+nsXULDocument::LoadScript(nsIURI* aURI, const char* aVersion, PRBool* aBlock)
 {
     // Load a transcluded script
     nsresult rv;
@@ -4499,6 +4498,7 @@ nsXULDocument::LoadScript(nsIURI* aURI, PRBool* aBlock)
         // call can get report the right file if there are errors in
         // the script.
         mCurrentScriptURL = aURI;
+        mCurrentScriptLanguageVersion = aVersion;
 
         nsCOMPtr<nsILoadGroup> group = do_QueryReferent(mDocumentLoadGroup);
 
@@ -4524,9 +4524,9 @@ nsXULDocument::LoadScript(nsIURI* aURI, PRBool* aBlock)
 
 nsresult
 nsXULDocument::DoneLoadingScript(nsIUnicharStreamLoader* aLoader,
-                                            nsString& aData,
-                                            void* aRef,
-                                            nsresult aStatus)
+                                 nsString& aData,
+                                 void* aRef,
+                                 nsresult aStatus)
 {
     // This is the completion routine that will be called when a
     // transcluded script completes. Evaluate the script if the load
@@ -4536,7 +4536,8 @@ nsXULDocument::DoneLoadingScript(nsIUnicharStreamLoader* aLoader,
     nsXULDocument* doc = NS_REINTERPRET_CAST(nsXULDocument*, aRef);
 
     if (NS_SUCCEEDED(aStatus)) {
-        rv = doc->EvaluateScript(doc->mCurrentScriptURL, aData, 1);
+        rv = doc->EvaluateScript(doc->mCurrentScriptURL, aData, 1,
+				 doc->mCurrentScriptLanguageVersion);
     }
 
     // balance the addref we added in LoadScript()
@@ -4550,7 +4551,7 @@ nsXULDocument::DoneLoadingScript(nsIUnicharStreamLoader* aLoader,
 
 
 nsresult
-nsXULDocument::EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLineNo)
+nsXULDocument::EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLineNo, const char* aVersion)
 {
     // Evaluate the script text in aScript, whose source is aURL
     // starting at aLineNo.
@@ -4573,8 +4574,8 @@ nsXULDocument::EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLi
 
     nsAutoString result;
     PRBool isUndefined;
-    rv = context->EvaluateString(aScript, urlspec, aLineNo, 
-                                 result, &isUndefined);
+    rv = context->EvaluateString(aScript, nsnull, mDocumentPrincipal, urlspec,
+                                 aLineNo, aVersion, result, &isUndefined);
     return rv;
 }
 
diff --git a/mozilla/rdf/content/src/nsXULDocument.h b/mozilla/rdf/content/src/nsXULDocument.h
index e2ccb6090b1..4755ff2ec45 100644
--- a/mozilla/rdf/content/src/nsXULDocument.h
+++ b/mozilla/rdf/content/src/nsXULDocument.h
@@ -576,14 +576,14 @@ protected:
      * prototype construction must 'block' until the load has
      * completed, aBlock will be set to true.
      */
-    nsresult LoadScript(nsIURI* aURI, PRBool* aBlock);
+    nsresult LoadScript(nsIURI* aURI, const char* aVersion, PRBool* aBlock);
 
     /**
      * Evaluate the script text in aScript. aURL and aLineNo
      * specify meta-information about the script in order to
      * provide useful error messages.
      */
-    nsresult EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLinenNo);
+    nsresult EvaluateScript(nsIURI* aURL, const nsString& aScript, PRInt32 aLinenNo, const char* aVersion);
 
     /**
      * Create a delegate content model element from a prototype.
@@ -611,9 +611,13 @@ protected:
                       nsresult aStatus);
 
     /**
-     * The URL of the current transcluded script that is being loaded
+     * The URL of the current transcluded script that is being loaded.
+     * For document.write('<script src="nestedwrite.js"><\/script>') to work,
+     * these need to be in a stack element type, and we need to hold the top
+     * of stack here.
      */
     nsCOMPtr<nsIURI> mCurrentScriptURL;
+    const char* mCurrentScriptLanguageVersion;
 
     /**
      * Create a XUL template builder on the specified node if a 'datasources'
diff --git a/mozilla/rdf/content/src/nsXULElement.h b/mozilla/rdf/content/src/nsXULElement.h
index 5cd04ee9f75..f50e381c8b8 100644
--- a/mozilla/rdf/content/src/nsXULElement.h
+++ b/mozilla/rdf/content/src/nsXULElement.h
@@ -164,8 +164,8 @@ public:
 class nsXULPrototypeScript : public nsXULPrototypeNode
 {
 public:
-    nsXULPrototypeScript(PRInt32 aLineNo)
-        : nsXULPrototypeNode(eType_Script, aLineNo)
+    nsXULPrototypeScript(PRInt32 aLineNo, const char *aVersion)
+        : nsXULPrototypeNode(eType_Script, aLineNo), mVersion(aVersion)
     {
         MOZ_COUNT_CTOR(nsXULPrototypeScript);
     }
@@ -177,6 +177,7 @@ public:
 
     nsCOMPtr<nsIURI>         mSrcURI;
     nsString                 mInlineScript;
+    const char*              mVersion;
 };
 
 class nsXULPrototypeText : public nsXULPrototypeNode
diff --git a/mozilla/webshell/tests/viewer/JSConsole.cpp b/mozilla/webshell/tests/viewer/JSConsole.cpp
index 8615ae6bd56..4175b0ee882 100644
--- a/mozilla/webshell/tests/viewer/JSConsole.cpp
+++ b/mozilla/webshell/tests/viewer/JSConsole.cpp
@@ -885,10 +885,11 @@ void JSConsole::EvaluateText(UINT aStartSel, UINT aEndSel)
             PRBool isUndefined;
 
             if (NS_SUCCEEDED(mContext->EvaluateString(nsString(cleanBuffer), 
-                                         nsnull,
-                                         0,
-                                         returnValue,
-                                         &isUndefined))) {
+                                                      nsnull,
+                                                      0,
+                                                      nsnull,
+                                                      returnValue,
+                                                      &isUndefined))) {
                 // output the result on the console and on the edit area
                 CHAR result[128];
                 LPSTR res = result;
diff --git a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
index f082c88c914..f27631f64b1 100644
--- a/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
+++ b/mozilla/xpfe/browser/src/nsBrowserInstance.cpp
@@ -2122,6 +2122,7 @@ nsBrowserAppCore::FindNext()
     return rv;
 }
 
+// XXXbe why is this needed?  eliminate
 NS_IMETHODIMP    
 nsBrowserAppCore::ExecuteScript(nsIScriptContext * aContext, const nsString& aScript)
 {
@@ -2132,7 +2133,7 @@ nsBrowserAppCore::ExecuteScript(nsIScriptContext * aContext, const nsString& aSc
     if (APP_DEBUG) {
       printf("Executing [%s]\n", (const char *)nsAutoCString(aScript));
     }
-    aContext->EvaluateString(aScript, url, 0, rVal, &isUndefined);
+    aContext->EvaluateString(aScript, url, 0, nsnull, rVal, &isUndefined);
   } 
   return NS_OK;
 }