diff --git a/mozilla/content/base/public/Makefile.in b/mozilla/content/base/public/Makefile.in
index 2c868e66a9b..0ed2b6115b6 100644
--- a/mozilla/content/base/public/Makefile.in
+++ b/mozilla/content/base/public/Makefile.in
@@ -60,6 +60,7 @@ nsINameSpace.h \
 nsINameSpaceManager.h \
 nsINodeInfo.h \
 nsIRangeUtils.h \
+nsIScriptElement.h \
 nsIStyledContent.h \
 nsIStyleRule.h \
 nsIStyleRuleSupplier.h \
diff --git a/mozilla/content/base/public/nsIContent.h b/mozilla/content/base/public/nsIContent.h
index 913f93fe985..3809e82be0d 100644
--- a/mozilla/content/base/public/nsIContent.h
+++ b/mozilla/content/base/public/nsIContent.h
@@ -468,7 +468,9 @@ public:
     /** XUL elements */
     eXUL                 = 0x00000010,
     /** xml processing instructions */
-    ePROCESSING_INSTRUCTION = 0x00000020
+    ePROCESSING_INSTRUCTION = 0x00000020,
+    /** svg elements */
+    eSVG                 = 0x00000040
   };
 
   /**
diff --git a/mozilla/content/base/public/nsIScriptElement.h b/mozilla/content/base/public/nsIScriptElement.h
new file mode 100644
index 00000000000..a49d9fcf1ee
--- /dev/null
+++ b/mozilla/content/base/public/nsIScriptElement.h
@@ -0,0 +1,66 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/*
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is Mozilla.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications.  Portions created by Netscape Communications are
+ * Copyright (C) 2001 by Netscape Communications.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s): 
+ *   Vidur Apparao <vidur@netscape.com> (original author)
+ */
+
+#ifndef nsIScriptElement_h___
+#define nsIScriptElement_h___
+
+#include "nsISupports.h"
+#include "nsIURI.h"
+#include "nsCOMPtr.h"
+
+#define NS_ISCRIPTELEMENT_IID                      \
+{ /*fa304da4-5e9c-45a6-a017-8cb011dc46b4 */        \
+ 0xfa304da4, 0x5e9c, 0x45a6,                       \
+ {0xa0, 0x17, 0x8c, 0xb0, 0x11, 0xdc, 0x46, 0xb4}} \
+
+/**
+ * Internal interface implemented by script elements
+ */
+class nsIScriptElement : public nsISupports {
+public:
+  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISCRIPTELEMENT_IID)
+
+  /**
+   * Content type identifying the scripting language. Can be empty, in
+   * which case javascript will be assumed.
+   */
+  virtual void GetScriptType(nsAString& type) = 0;
+    
+  /**
+   * Location of script source text. Can return null, in which case
+   * this is assumed to be an inline script element.
+   */
+  virtual already_AddRefed<nsIURI> GetScriptURI() = 0;
+  
+  /**
+   * Script source text for inline script elements.
+   */
+  virtual void GetScriptText(nsAString& text) = 0;
+
+  virtual void GetScriptCharset(nsAString& charset) = 0;
+  
+  virtual void SetScriptLineNumber(PRUint32 aLineNumber) = 0;
+  virtual PRUint32 GetScriptLineNumber() = 0;
+};
+
+#endif // nsIScriptElement_h___
diff --git a/mozilla/content/base/public/nsIScriptLoader.idl b/mozilla/content/base/public/nsIScriptLoader.idl
index a813a45a770..ecdb7ace771 100644
--- a/mozilla/content/base/public/nsIScriptLoader.idl
+++ b/mozilla/content/base/public/nsIScriptLoader.idl
@@ -39,7 +39,7 @@
 #include "nsISupports.idl"
 
 interface nsIDocument;
-interface nsIDOMHTMLScriptElement;
+interface nsIScriptElement;
 interface nsIScriptLoaderObserver;
 
 [scriptable, uuid(501209d3-7edf-437d-9948-3c6d1c08ef7a)]
@@ -86,7 +86,7 @@ interface nsIScriptLoader : nsISupports {
    * @param aObserver An observer for this script load only
    *
    */
-  void processScriptElement(in nsIDOMHTMLScriptElement aElement,
+  void processScriptElement(in nsIScriptElement aElement,
                             in nsIScriptLoaderObserver aObserver);
 
   /**
diff --git a/mozilla/content/base/public/nsIScriptLoaderObserver.idl b/mozilla/content/base/public/nsIScriptLoaderObserver.idl
index cfdb9508895..03b747b1aa9 100644
--- a/mozilla/content/base/public/nsIScriptLoaderObserver.idl
+++ b/mozilla/content/base/public/nsIScriptLoaderObserver.idl
@@ -38,7 +38,7 @@
 
 #include "nsISupports.idl"
 
-interface nsIDOMHTMLScriptElement;
+interface nsIScriptElement;
 interface nsIURI;
 
 [scriptable, uuid(501209d3-7edf-437d-9948-3c6d1c08ef7f)]
@@ -65,7 +65,7 @@ interface nsIScriptLoaderObserver : nsISupports {
    * @param aScript String representation of the string to be evaluated.
    */
   void scriptAvailable(in nsresult aResult, 
-                       in nsIDOMHTMLScriptElement aElement,
+                       in nsIScriptElement aElement,
                        in boolean aIsInline,
                        in boolean aWasPending,
                        in nsIURI aURI,
@@ -85,7 +85,7 @@ interface nsIScriptLoaderObserver : nsISupports {
    *                    script was delayed?
    */
   void scriptEvaluated(in nsresult aResult, 
-                       in nsIDOMHTMLScriptElement aElement,
+                       in nsIScriptElement aElement,
                        in boolean aIsInline,
                        in boolean aWasPending);
 		       
diff --git a/mozilla/content/base/src/nsContentSink.cpp b/mozilla/content/base/src/nsContentSink.cpp
index 1d5e837442a..c13bacf6b0a 100644
--- a/mozilla/content/base/src/nsContentSink.cpp
+++ b/mozilla/content/base/src/nsContentSink.cpp
@@ -51,7 +51,7 @@
 #include "nsNetUtil.h"
 #include "nsIHttpChannel.h"
 #include "nsIContent.h"
-#include "nsIDOMHTMLScriptElement.h"
+#include "nsIScriptElement.h"
 #include "nsIParser.h"
 #include "nsContentErrors.h"
 #include "nsIPresShell.h"
@@ -107,7 +107,7 @@ NS_IMPL_ISUPPORTS1(nsScriptLoaderObserverProxy, nsIScriptLoaderObserver)
 
 NS_IMETHODIMP
 nsScriptLoaderObserverProxy::ScriptAvailable(nsresult aResult,
-                                             nsIDOMHTMLScriptElement *aElement,
+                                             nsIScriptElement *aElement,
                                              PRBool aIsInline,
                                              PRBool aWasPending,
                                              nsIURI *aURI,
@@ -126,7 +126,7 @@ nsScriptLoaderObserverProxy::ScriptAvailable(nsresult aResult,
 
 NS_IMETHODIMP
 nsScriptLoaderObserverProxy::ScriptEvaluated(nsresult aResult,
-                                             nsIDOMHTMLScriptElement *aElement,
+                                             nsIScriptElement *aElement,
                                              PRBool aIsInline,
                                              PRBool aWasPending)
 {
@@ -203,7 +203,7 @@ nsContentSink::StyleSheetLoaded(nsICSSStyleSheet* aSheet,
 
 NS_IMETHODIMP
 nsContentSink::ScriptAvailable(nsresult aResult,
-                               nsIDOMHTMLScriptElement *aElement,
+                               nsIScriptElement *aElement,
                                PRBool aIsInline,
                                PRBool aWasPending,
                                nsIURI *aURI,
@@ -250,7 +250,7 @@ nsContentSink::ScriptAvailable(nsresult aResult,
 
 NS_IMETHODIMP
 nsContentSink::ScriptEvaluated(nsresult aResult,
-                               nsIDOMHTMLScriptElement *aElement,
+                               nsIScriptElement *aElement,
                                PRBool aIsInline,
                                PRBool aWasPending)
 {
diff --git a/mozilla/content/base/src/nsContentSink.h b/mozilla/content/base/src/nsContentSink.h
index c71e33c3682..6d45644f458 100644
--- a/mozilla/content/base/src/nsContentSink.h
+++ b/mozilla/content/base/src/nsContentSink.h
@@ -113,7 +113,7 @@ protected:
   nsCOMPtr<nsICSSLoader>        mCSSLoader;
   nsRefPtr<nsNodeInfoManager>   mNodeInfoManager;
 
-  nsCOMArray<nsIDOMHTMLScriptElement> mScriptElements;
+  nsCOMArray<nsIScriptElement> mScriptElements;
 
   nsCString mRef; // ScrollTo #ref
   PRBool mNeedToBlockParser;
diff --git a/mozilla/content/base/src/nsGenericElement.cpp b/mozilla/content/base/src/nsGenericElement.cpp
index ea03617a91a..702df06d15b 100644
--- a/mozilla/content/base/src/nsGenericElement.cpp
+++ b/mozilla/content/base/src/nsGenericElement.cpp
@@ -3586,3 +3586,26 @@ nsGenericElement::IndexOf(nsIContent* aPossibleChild) const
 
   return mAttrsAndChildren.IndexOfChild(aPossibleChild);
 }
+
+void
+nsGenericElement::GetContentsAsText(nsAString& aText)
+{
+  aText.Truncate();
+  PRInt32 children = GetChildCount();
+  
+  nsCOMPtr<nsIDOMText> tc;
+  nsAutoString textData;
+
+  PRInt32 i;
+  for (i = 0; i < children; ++i) {
+    tc = do_QueryInterface(GetChildAt(i));
+    if (tc) {
+      if (aText.IsEmpty()) {
+        tc->GetData(aText);
+      } else {
+        tc->GetData(textData);
+        aText.Append(textData);
+      }
+    }
+  }
+}
diff --git a/mozilla/content/base/src/nsGenericElement.h b/mozilla/content/base/src/nsGenericElement.h
index eac631e3eaf..7554708b9c9 100644
--- a/mozilla/content/base/src/nsGenericElement.h
+++ b/mozilla/content/base/src/nsGenericElement.h
@@ -743,6 +743,17 @@ protected:
     return NS_REINTERPRET_CAST(nsIContent *, mParentPtrBits);
   }
 
+  /**
+   * GetContentsAsText will take all the textnodes that are children
+   * of |this| and concatenate the text in them into aText.  It
+   * completely ignores any non-text-node children of |this|; in
+   * particular it does not descend into any children of |this| that
+   * happen to be container elements.
+   *
+   * @param aText the resulting text [OUT]
+   */
+  void GetContentsAsText(nsAString& aText);
+
   /**
    * Information about this type of node
    */
diff --git a/mozilla/content/base/src/nsScriptLoader.cpp b/mozilla/content/base/src/nsScriptLoader.cpp
index d1887637338..f1cc9149a45 100644
--- a/mozilla/content/base/src/nsScriptLoader.cpp
+++ b/mozilla/content/base/src/nsScriptLoader.cpp
@@ -54,6 +54,7 @@
 #include "nsIDOMWindow.h"
 #include "nsIHttpChannel.h"
 #include "nsIScriptElement.h"
+#include "nsIDOMHTMLScriptElement.h"
 #include "nsIDocShell.h"
 #include "jsapi.h"
 #include "nsContentUtils.h"
@@ -104,7 +105,7 @@ IntersectPrincipalCerts(nsIPrincipal *aOld, nsIPrincipal *aNew)
 
 class nsScriptLoadRequest : public nsISupports {
 public:
-  nsScriptLoadRequest(nsIDOMHTMLScriptElement* aElement,
+  nsScriptLoadRequest(nsIScriptElement* aElement,
                       nsIScriptLoaderObserver* aObserver,
                       const char* aVersionString);
   virtual ~nsScriptLoadRequest();
@@ -115,7 +116,7 @@ public:
                            const nsAFlatString& aScript);
   void FireScriptEvaluated(nsresult aResult);
   
-  nsCOMPtr<nsIDOMHTMLScriptElement> mElement;
+  nsCOMPtr<nsIScriptElement> mElement;
   nsCOMPtr<nsIScriptLoaderObserver> mObserver;
   PRPackedBool mLoading;             // Are we still waiting for a load to complete?
   PRPackedBool mWasPending;          // Processed immediately or pending
@@ -126,7 +127,7 @@ public:
   PRInt32 mLineNo;
 };
 
-nsScriptLoadRequest::nsScriptLoadRequest(nsIDOMHTMLScriptElement* aElement,
+nsScriptLoadRequest::nsScriptLoadRequest(nsIScriptElement* aElement,
                                          nsIScriptLoaderObserver* aObserver,
                                          const char* aVersionString) :
   mElement(aElement), mObserver(aObserver), 
@@ -239,7 +240,7 @@ nsScriptLoader::RemoveObserver(nsIScriptLoaderObserver *aObserver)
 }
 
 PRBool
-nsScriptLoader::InNonScriptingContainer(nsIDOMHTMLScriptElement* aScriptElement)
+nsScriptLoader::InNonScriptingContainer(nsIScriptElement* aScriptElement)
 {
   nsCOMPtr<nsIDOMNode> node(do_QueryInterface(aScriptElement));
   nsCOMPtr<nsIDOMNode> parent;
@@ -285,7 +286,7 @@ nsScriptLoader::InNonScriptingContainer(nsIDOMHTMLScriptElement* aScriptElement)
 // <script for=... event=...> element.
 
 PRBool
-nsScriptLoader::IsScriptEventHandler(nsIDOMHTMLScriptElement *aScriptElement)
+nsScriptLoader::IsScriptEventHandler(nsIScriptElement *aScriptElement)
 {
   nsCOMPtr<nsIContent> contElement = do_QueryInterface(aScriptElement);
   if (!contElement ||
@@ -341,9 +342,9 @@ nsScriptLoader::IsScriptEventHandler(nsIDOMHTMLScriptElement *aScriptElement)
   return PR_FALSE;
 }
 
-/* void processScriptElement (in nsIDOMHTMLScriptElement aElement, in nsIScriptLoaderObserver aObserver); */
+/* void processScriptElement (in nsIScriptElement aElement, in nsIScriptLoaderObserver aObserver); */
 NS_IMETHODIMP 
-nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement, 
+nsScriptLoader::ProcessScriptElement(nsIScriptElement *aElement, 
                                      nsIScriptLoaderObserver *aObserver)
 {
   NS_ENSURE_ARG(aElement);
@@ -391,14 +392,19 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement,
   const char* jsVersionString = nsnull;
   nsAutoString language, type, src;
 
-  // Check the language attribute first, so type can trump language.
-  aElement->GetAttribute(NS_LITERAL_STRING("language"), language);
-  if (!language.IsEmpty()) {
-    isJavaScript = nsParserUtils::IsJavaScriptLanguage(language, &jsVersionString);
+  // "language" is a depreciated attribute of HTML, so we only check
+  // it for HTML script elements
+  nsCOMPtr<nsIDOMHTMLScriptElement> htmlScriptElement = do_QueryInterface(aElement);
+  if (htmlScriptElement) {
+    // Check the language attribute first, so type can trump language.
+    htmlScriptElement->GetAttribute(NS_LITERAL_STRING("language"), language);
+    if (!language.IsEmpty()) {
+      isJavaScript = nsParserUtils::IsJavaScriptLanguage(language, &jsVersionString);
+    }
   }
 
   // Check the type attribute to determine language and version.
-  aElement->GetType(type);
+  aElement->GetScriptType(type);
   if (!type.IsEmpty()) {
     nsAutoString  mimeType;
     nsAutoString  params;
@@ -437,21 +443,9 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement,
     return FireErrorNotification(NS_ERROR_OUT_OF_MEMORY, aElement, aObserver);
   }
 
-  // Check to see if we have a src attribute.
-  aElement->GetSrc(src);
-  if (!src.IsEmpty()) {
-    nsCOMPtr<nsIURI> scriptURI;
-
-    // Use the SRC attribute value to load the URL
-    nsCOMPtr<nsIContent> content(do_QueryInterface(aElement));
-    NS_ASSERTION(content, "nsIDOMHTMLScriptElement not implementing nsIContent");
-    nsCOMPtr<nsIURI> baseURI = content->GetBaseURI();
-    rv = NS_NewURI(getter_AddRefs(scriptURI), src, nsnull, baseURI);
-
-    if (NS_FAILED(rv)) {
-      return FireErrorNotification(rv, aElement, aObserver);
-    }
-
+  // First check to see if this is an external script
+  nsCOMPtr<nsIURI> scriptURI = aElement->GetScriptURI();
+  if (scriptURI) {
     // Check that the containing page is allowed to load this URI.
     nsIPrincipal *docPrincipal = mDocument->GetPrincipal();
     if (!docPrincipal) {
@@ -469,10 +463,11 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement,
     if (globalObject) {
       PRInt16 shouldLoad = nsIContentPolicy::ACCEPT;
       nsIURI *docURI = mDocument->GetDocumentURI();
+      nsCOMPtr<nsIDOMNode> node(do_QueryInterface(aElement));
       rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_SCRIPT,
                                      scriptURI,
                                      docURI,
-                                     aElement,
+                                     node,
                                      NS_LossyConvertUCS2toASCII(type),
                                      nsnull,    //extra
                                      &shouldLoad);
@@ -525,12 +520,7 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement,
     request->mIsInline = PR_TRUE;
     request->mURI = mDocument->GetDocumentURI();
 
-    nsCOMPtr<nsIScriptElement> scriptElement(do_QueryInterface(aElement));
-    if (scriptElement) {
-      PRUint32 lineNumber;
-      scriptElement->GetLineNumber(&lineNumber);
-      request->mLineNo = lineNumber;
-    }
+    request->mLineNo = aElement->GetScriptLineNumber();
 
     // If we've got existing pending requests, add ourselves
     // to this list.
@@ -549,7 +539,7 @@ nsScriptLoader::ProcessScriptElement(nsIDOMHTMLScriptElement *aElement,
 
 nsresult
 nsScriptLoader::FireErrorNotification(nsresult aResult,
-                                      nsIDOMHTMLScriptElement* aElement,
+                                      nsIScriptElement* aElement,
                                       nsIScriptLoaderObserver* aObserver)
 {
   PRInt32 count = mObservers.Count();
@@ -585,7 +575,7 @@ nsScriptLoader::ProcessRequest(nsScriptLoadRequest* aRequest)
   if (aRequest->mIsInline) {
     // XXX This is inefficient - GetText makes multiple
     // copies.
-    aRequest->mElement->GetText(textData);
+    aRequest->mElement->GetScriptText(textData);
 
     script = &textData;
   }
@@ -799,8 +789,8 @@ nsScriptLoader::OnStreamComplete(nsIStreamLoader* aLoader,
     if (NS_FAILED(rv) || characterSet.IsEmpty()) {
       // Check the charset attribute to determine script charset.
       nsAutoString charset;
-      rv = request->mElement->GetCharset(charset);
-      if (NS_SUCCEEDED(rv)) {  
+      request->mElement->GetScriptCharset(charset);
+      if (!charset.IsEmpty()) {  
         // charset name is always ASCII.
         LossyCopyUTF16toASCII(charset, characterSet);
       }
diff --git a/mozilla/content/base/src/nsScriptLoader.h b/mozilla/content/base/src/nsScriptLoader.h
index e9a513b4433..425b7efc168 100644
--- a/mozilla/content/base/src/nsScriptLoader.h
+++ b/mozilla/content/base/src/nsScriptLoader.h
@@ -41,7 +41,7 @@
 
 #include "nsCOMPtr.h"
 #include "nsIScriptLoader.h"
-#include "nsIDOMHTMLScriptElement.h"
+#include "nsIScriptElement.h"
 #include "nsIScriptLoaderObserver.h"
 #include "nsIURI.h"
 #include "nsCOMArray.h"
@@ -66,10 +66,10 @@ public:
   NS_DECL_NSISTREAMLOADEROBSERVER
 
 protected:
-  PRBool InNonScriptingContainer(nsIDOMHTMLScriptElement* aScriptElement);
-  PRBool IsScriptEventHandler(nsIDOMHTMLScriptElement* aScriptElement);
+  PRBool InNonScriptingContainer(nsIScriptElement* aScriptElement);
+  PRBool IsScriptEventHandler(nsIScriptElement* aScriptElement);
   nsresult FireErrorNotification(nsresult aResult,
-                                 nsIDOMHTMLScriptElement* aElement,
+                                 nsIScriptElement* aElement,
                                  nsIScriptLoaderObserver* aObserver);
   nsresult ProcessRequest(nsScriptLoadRequest* aRequest);
   void FireScriptAvailable(nsresult aResult,
diff --git a/mozilla/content/html/content/public/Makefile.in b/mozilla/content/html/content/public/Makefile.in
index 81f3e3c1dc8..21183bec68d 100644
--- a/mozilla/content/html/content/public/Makefile.in
+++ b/mozilla/content/html/content/public/Makefile.in
@@ -59,9 +59,7 @@ EXPORTS		= \
 		nsIRadioControlElement.h \
 		nsIRadioVisitor.h \
 		nsIRadioGroupContainer.h \
-		nsIScriptElement.h \
 		nsITextControlElement.h \
-		nsIScriptElement.h \
 		nsIFormSubmission.h \
 		nsIFrameSetElement.h \
                 $(NULL)
diff --git a/mozilla/content/html/content/public/nsIScriptElement.h b/mozilla/content/html/content/public/nsIScriptElement.h
deleted file mode 100644
index 2768f43faea..00000000000
--- a/mozilla/content/html/content/public/nsIScriptElement.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Mozilla.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications.
- * Portions created by the Initial Developer are Copyright (C) 2001
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Vidur Apparao <vidur@netscape.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef nsIScriptElement_h___
-#define nsIScriptElement_h___
-
-#include "nsISupports.h"
-
-#define NS_ISCRIPTELEMENT_IID                     \
-{ /* c9cbf78e-b7c1-48b0-a933-78d62b83a675 */      \
- 0xc9cbf78e, 0xb7c1, 0x48b0,                      \
-{0xa9, 0x33, 0x78, 0xd6, 0x2b, 0x83, 0xa6, 0x75}} \
-
-/**
- * Internal interface so that the content sink can let a
- * script element know about its origin line number.
- */
-class nsIScriptElement : public nsISupports {
-public:
-  NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISCRIPTELEMENT_IID)
-
-  NS_IMETHOD SetLineNumber(PRUint32 aLineNumber) = 0;
-  NS_IMETHOD GetLineNumber(PRUint32* aLineNumber) = 0;
-};
-
-#endif // nsIScriptElement_h___
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
index a81eb4dd3e4..3b7bc0ea201 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.cpp
@@ -3071,31 +3071,6 @@ nsGenericHTMLElement::ReplaceContentsWithText(const nsAString& aText,
   return rv;
 }
 
-nsresult
-nsGenericHTMLElement::GetContentsAsText(nsAString& aText)
-{
-  aText.Truncate();
-  PRInt32 children = GetChildCount();
-  
-  nsCOMPtr<nsIDOMText> tc;
-  nsAutoString textData;
-
-  PRInt32 i;
-  for (i = 0; i < children; ++i) {
-    tc = do_QueryInterface(GetChildAt(i));
-    if (tc) {
-      if (aText.IsEmpty()) {
-        tc->GetData(aText);
-      } else {
-        tc->GetData(textData);
-        aText.Append(textData);
-      }
-    }
-  }
-  
-  return NS_OK;
-}
-
 nsresult
 nsGenericHTMLElement::GetAttrHelper(nsIAtom* aAttr, nsAString& aValue)
 {
diff --git a/mozilla/content/html/content/src/nsGenericHTMLElement.h b/mozilla/content/html/content/src/nsGenericHTMLElement.h
index 0aaff53d3b2..4466565d8e2 100644
--- a/mozilla/content/html/content/src/nsGenericHTMLElement.h
+++ b/mozilla/content/html/content/src/nsGenericHTMLElement.h
@@ -749,17 +749,6 @@ protected:
    */
   nsresult ReplaceContentsWithText(const nsAString& aText, PRBool aNotify);
 
-  /**
-   * GetContentsAsText will take all the textnodes that are children
-   * of |this| and concatenate the text in them into aText.  It
-   * completely ignores any non-text-node children of |this|; in
-   * particular it does not descend into any children of |this| that
-   * happen to be container elements.
-   *
-   * @param aText the resulting text [OUT]
-   */
-  nsresult GetContentsAsText(nsAString& aText);
-
   /**
    * Helper method for NS_IMPL_STRING_ATTR macro.
    * Gets the value of an attribute, returns empty string if
diff --git a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp
index 40c78dffcdb..7ae5560d9b8 100644
--- a/mozilla/content/html/content/src/nsHTMLScriptElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLScriptElement.cpp
@@ -48,6 +48,7 @@
 #include "nsIScriptElement.h"
 #include "nsGUIEvent.h"
 #include "nsIURI.h"
+#include "nsNetUtil.h"
 
 #include "nsUnicharUtils.h"  // for nsCaseInsensitiveCaseComparator()
 #include "jsapi.h"
@@ -201,7 +202,7 @@ nsHTMLScriptEventHandler::Invoke(nsISupports *aTargetObject,
   PRUint32 lineNumber = 0;
   nsCOMPtr<nsIScriptElement> sele(do_QueryInterface(mOuter));
   if (sele) {
-    (void) sele->GetLineNumber(&lineNumber);
+    lineNumber = sele->GetScriptLineNumber();
   }
 
   // Get the script context...
@@ -334,8 +335,12 @@ public:
   NS_DECL_NSISCRIPTLOADEROBSERVER
 
   // nsIScriptElement
-  NS_IMETHOD SetLineNumber(PRUint32 aLineNumber);
-  NS_IMETHOD GetLineNumber(PRUint32* aLineNumber);
+  virtual void GetScriptType(nsAString& type);
+  virtual already_AddRefed<nsIURI> GetScriptURI();
+  virtual void GetScriptText(nsAString& text);
+  virtual void GetScriptCharset(nsAString& charset); 
+  virtual void SetScriptLineNumber(PRUint32 aLineNumber);
+  virtual PRUint32 GetScriptLineNumber();
 
   // nsIContent
   nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName,
@@ -501,7 +506,8 @@ nsHTMLScriptElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
 NS_IMETHODIMP
 nsHTMLScriptElement::GetText(nsAString& aValue)
 {
-  return GetContentsAsText(aValue);
+  GetContentsAsText(aValue);
+  return NS_OK;
 }
 
 NS_IMETHODIMP
@@ -521,7 +527,8 @@ NS_IMPL_STRING_ATTR(nsHTMLScriptElement, Event, _event)
 nsresult
 nsHTMLScriptElement::GetInnerHTML(nsAString& aInnerHTML)
 {
-  return GetContentsAsText(aInnerHTML);
+  GetContentsAsText(aInnerHTML);
+  return NS_OK;
 }
 
 nsresult
@@ -530,10 +537,13 @@ nsHTMLScriptElement::SetInnerHTML(const nsAString& aInnerHTML)
   return ReplaceContentsWithText(aInnerHTML, PR_TRUE);
 }
 
-/* void scriptAvailable (in nsresult aResult, in nsIDOMHTMLScriptElement aElement, in nsIURI aURI, in PRInt32 aLineNo, in PRUint32 aScriptLength, [size_is (aScriptLength)] in wstring aScript); */
+// variation of this code in nsSVGScriptElement - check if changes
+// need to be transfered when modifying
+
+/* void scriptAvailable (in nsresult aResult, in nsIScriptElement aElement , in nsIURI aURI, in PRInt32 aLineNo, in PRUint32 aScriptLength, [size_is (aScriptLength)] in wstring aScript); */
 NS_IMETHODIMP
 nsHTMLScriptElement::ScriptAvailable(nsresult aResult,
-                                     nsIDOMHTMLScriptElement *aElement,
+                                     nsIScriptElement *aElement,
                                      PRBool aIsInline,
                                      PRBool aWasPending,
                                      nsIURI *aURI,
@@ -565,10 +575,13 @@ nsHTMLScriptElement::ScriptAvailable(nsresult aResult,
   return NS_OK;
 }
 
-/* void scriptEvaluated (in nsresult aResult, in nsIDOMHTMLScriptElement aElement); */
+// variation of this code in nsSVGScriptElement - check if changes
+// need to be transfered when modifying
+
+/* void scriptEvaluated (in nsresult aResult, in nsIScriptElement aElement); */
 NS_IMETHODIMP
 nsHTMLScriptElement::ScriptEvaluated(nsresult aResult,
-                                     nsIDOMHTMLScriptElement *aElement,
+                                     nsIScriptElement *aElement,
                                      PRBool aIsInline,
                                      PRBool aWasPending)
 {
@@ -586,24 +599,53 @@ nsHTMLScriptElement::ScriptEvaluated(nsresult aResult,
   return rv;
 }
 
-NS_IMETHODIMP
-nsHTMLScriptElement::SetLineNumber(PRUint32 aLineNumber)
+void
+nsHTMLScriptElement::GetScriptType(nsAString& type)
+{
+  GetType(type);
+}
+
+// variation of this code in nsSVGScriptElement - check if changes
+// need to be transfered when modifying
+
+already_AddRefed<nsIURI>
+nsHTMLScriptElement::GetScriptURI()
+{
+  nsIURI *uri = nsnull;
+  nsAutoString src;
+  GetSrc(src);
+  if (!src.IsEmpty())
+    NS_NewURI(&uri, src);
+  return uri;
+}
+
+void
+nsHTMLScriptElement::GetScriptText(nsAString& text)
+{
+  GetText(text);
+}
+
+void
+nsHTMLScriptElement::GetScriptCharset(nsAString& charset)
+{
+  GetCharset(charset);
+}
+
+void 
+nsHTMLScriptElement::SetScriptLineNumber(PRUint32 aLineNumber)
 {
   mLineNumber = aLineNumber;
-
-  return NS_OK;
 }
 
-NS_IMETHODIMP
-nsHTMLScriptElement::GetLineNumber(PRUint32* aLineNumber)
+PRUint32
+nsHTMLScriptElement::GetScriptLineNumber()
 {
-  NS_ENSURE_ARG_POINTER(aLineNumber);
-
-  *aLineNumber = mLineNumber;
-
-  return NS_OK;
+  return mLineNumber;
 }
 
+// variation of this code in nsSVGScriptElement - check if changes
+// need to be transfered when modifying
+
 void
 nsHTMLScriptElement::MaybeProcessScript()
 {
diff --git a/mozilla/content/html/content/src/nsHTMLSpanElement.cpp b/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
index 506574b4384..aea191a5cc3 100644
--- a/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLSpanElement.cpp
@@ -124,7 +124,8 @@ nsHTMLSpanElement::GetInnerHTML(nsAString& aInnerHTML)
 {
   if (mNodeInfo->Equals(nsHTMLAtoms::xmp) ||
       mNodeInfo->Equals(nsHTMLAtoms::plaintext)) {
-    return GetContentsAsText(aInnerHTML);
+    GetContentsAsText(aInnerHTML);
+    return NS_OK;
   }
 
   return nsGenericHTMLElement::GetInnerHTML(aInnerHTML);  
diff --git a/mozilla/content/html/content/src/nsHTMLStyleElement.cpp b/mozilla/content/html/content/src/nsHTMLStyleElement.cpp
index 7adaebbac7e..48aa50454cf 100644
--- a/mozilla/content/html/content/src/nsHTMLStyleElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLStyleElement.cpp
@@ -252,7 +252,8 @@ nsHTMLStyleElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
 nsresult
 nsHTMLStyleElement::GetInnerHTML(nsAString& aInnerHTML)
 {
-  return GetContentsAsText(aInnerHTML);
+  GetContentsAsText(aInnerHTML);
+  return NS_OK;
 }
 
 nsresult
diff --git a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp
index c2ecbba7388..be251e7b64e 100644
--- a/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp
+++ b/mozilla/content/html/content/src/nsHTMLTextAreaElement.cpp
@@ -462,7 +462,8 @@ nsHTMLTextAreaElement::SetValueChanged(PRBool aValueChanged)
 NS_IMETHODIMP
 nsHTMLTextAreaElement::GetDefaultValue(nsAString& aDefaultValue)
 {
-  return GetContentsAsText(aDefaultValue);
+  GetContentsAsText(aDefaultValue);
+  return NS_OK;
 }  
 
 NS_IMETHODIMP
@@ -649,7 +650,8 @@ nsHTMLTextAreaElement::IsDoneAddingChildren()
 nsresult
 nsHTMLTextAreaElement::GetInnerHTML(nsAString& aInnerHTML)
 {
-  return GetContentsAsText(aInnerHTML);
+  GetContentsAsText(aInnerHTML);
+  return NS_OK;
 }
 
 nsresult
diff --git a/mozilla/content/html/document/src/nsHTMLContentSink.cpp b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
index ac9de6b9618..8d6c607bfdf 100644
--- a/mozilla/content/html/document/src/nsHTMLContentSink.cpp
+++ b/mozilla/content/html/document/src/nsHTMLContentSink.cpp
@@ -4211,7 +4211,7 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
   dtd->CollectSkippedContent(eHTMLTag_script, script, lineNo);
 
   if (sele) {
-    sele->SetLineNumber((PRUint32)lineNo);
+    sele->SetScriptLineNumber((PRUint32)lineNo);
   }
 
   // Create a text node holding the content. First, get the text
@@ -4249,8 +4249,7 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
     // to our ScriptAvailable method.
     mNeedToBlockParser = PR_TRUE;
 
-    nsCOMPtr<nsIDOMHTMLScriptElement> scriptElement = do_QueryInterface(element);
-    mScriptElements.AppendObject(scriptElement);
+    mScriptElements.AppendObject(sele);
   }
 
   // Insert the child into the content tree. This will evaluate the
diff --git a/mozilla/content/shared/public/nsSVGAtomList.h b/mozilla/content/shared/public/nsSVGAtomList.h
index 8d7dd9ca969..67133cb27af 100644
--- a/mozilla/content/shared/public/nsSVGAtomList.h
+++ b/mozilla/content/shared/public/nsSVGAtomList.h
@@ -67,6 +67,7 @@ SVG_ATOM(path, "path")
 SVG_ATOM(polygon, "polygon")
 SVG_ATOM(polyline, "polyline")
 SVG_ATOM(rect, "rect")
+SVG_ATOM(script, "script")
 SVG_ATOM(svg, "svg")
 SVG_ATOM(text, "text")
 SVG_ATOM(tref, "tref")
diff --git a/mozilla/content/svg/content/src/Makefile.in b/mozilla/content/svg/content/src/Makefile.in
index 367334e10eb..aab0a83f2ff 100644
--- a/mozilla/content/svg/content/src/Makefile.in
+++ b/mozilla/content/svg/content/src/Makefile.in
@@ -93,6 +93,7 @@ CPPSRCS		= \
 		nsSVGPolygonElement.cpp \
 		nsSVGPolylineElement.cpp \
 		nsSVGPreserveAspectRatio.cpp \
+		nsSVGScriptElement.cpp \
 		nsSVGStringProxyValue.cpp \
 		nsSVGStylableElement.cpp \
 		nsSVGRect.cpp \
diff --git a/mozilla/content/svg/content/src/nsSVGAtomList.h b/mozilla/content/svg/content/src/nsSVGAtomList.h
index 8d7dd9ca969..67133cb27af 100644
--- a/mozilla/content/svg/content/src/nsSVGAtomList.h
+++ b/mozilla/content/svg/content/src/nsSVGAtomList.h
@@ -67,6 +67,7 @@ SVG_ATOM(path, "path")
 SVG_ATOM(polygon, "polygon")
 SVG_ATOM(polyline, "polyline")
 SVG_ATOM(rect, "rect")
+SVG_ATOM(script, "script")
 SVG_ATOM(svg, "svg")
 SVG_ATOM(text, "text")
 SVG_ATOM(tref, "tref")
diff --git a/mozilla/content/svg/content/src/nsSVGElement.cpp b/mozilla/content/svg/content/src/nsSVGElement.cpp
index 5c8f83d3d57..9ad125fc66f 100644
--- a/mozilla/content/svg/content/src/nsSVGElement.cpp
+++ b/mozilla/content/svg/content/src/nsSVGElement.cpp
@@ -214,6 +214,12 @@ nsSVGElement::SetBindingParent(nsIContent* aParent)
   return rv;
 }
 
+PRBool
+nsSVGElement::IsContentOfType(PRUint32 aFlags) const
+{
+  return !(aFlags & ~(eELEMENT | eSVG));
+}
+
 //----------------------------------------------------------------------
 // nsIStyledContent methods
 
diff --git a/mozilla/content/svg/content/src/nsSVGElement.h b/mozilla/content/svg/content/src/nsSVGElement.h
index 08a948b6f4e..7ffda45aefe 100644
--- a/mozilla/content/svg/content/src/nsSVGElement.h
+++ b/mozilla/content/svg/content/src/nsSVGElement.h
@@ -81,6 +81,7 @@ public:
                            PRBool aNotify);
 
   virtual nsresult SetBindingParent(nsIContent* aParent);
+  virtual PRBool IsContentOfType(PRUint32 aFlags) const;
 
   // nsIStyledContent
   NS_IMETHOD GetID(nsIAtom** aResult) const;
diff --git a/mozilla/content/svg/content/src/nsSVGElementFactory.cpp b/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
index 12793c859da..75653bcce35 100644
--- a/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
+++ b/mozilla/content/svg/content/src/nsSVGElementFactory.cpp
@@ -73,6 +73,8 @@ nsresult
 NS_NewSVGStyleElement(nsIContent **aResult, nsINodeInfo *aNodeInfo);
 nsresult
 NS_NewSVGDefsElement(nsIContent **aResult, nsINodeInfo *aNodeInfo);
+nsresult
+NS_NewSVGScriptElement(nsIContent **aResult, nsINodeInfo *aNodeInfo);
 
 nsresult
 NS_NewSVGElement(nsIContent** aResult, nsINodeInfo *aNodeInfo)
@@ -109,6 +111,8 @@ NS_NewSVGElement(nsIContent** aResult, nsINodeInfo *aNodeInfo)
     return NS_NewSVGStyleElement(aResult, aNodeInfo);
   if (name == nsSVGAtoms::defs)
     return NS_NewSVGDefsElement(aResult, aNodeInfo);
+  if (name == nsSVGAtoms::script)
+    return NS_NewSVGScriptElement(aResult, aNodeInfo);
 
   // if we don't know what to create, just create a standard xml element:
   return NS_NewXMLElement(aResult, aNodeInfo);
diff --git a/mozilla/content/svg/content/src/nsSVGScriptElement.cpp b/mozilla/content/svg/content/src/nsSVGScriptElement.cpp
new file mode 100644
index 00000000000..45b3b1ad99b
--- /dev/null
+++ b/mozilla/content/svg/content/src/nsSVGScriptElement.cpp
@@ -0,0 +1,415 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ----- BEGIN LICENSE BLOCK -----
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla SVG project.
+ *
+ * The Initial Developer of the Original Code is 
+ * Crocodile Clips Ltd..
+ * Portions created by the Initial Developer are Copyright (C) 2002
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *    Alex Fritze <alex@croczilla.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ----- END LICENSE BLOCK ----- */
+
+#include "nsSVGElement.h"
+#include "nsSVGAtoms.h"
+#include "nsIDOMSVGScriptElement.h"
+#include "nsIDOMSVGURIReference.h"
+#include "nsCOMPtr.h"
+#include "nsSVGAnimatedString.h"
+#include "nsIURI.h"
+#include "nsNetUtil.h"
+#include "nsIScriptElement.h"
+#include "nsIScriptLoader.h"
+#include "nsIScriptLoaderObserver.h"
+#include "nsIPresShell.h"
+#include "nsIPresContext.h"
+#include "nsGUIEvent.h"
+#include "nsIDOMText.h"
+
+typedef nsSVGElement nsSVGScriptElementBase;
+
+class nsSVGScriptElement : public nsSVGScriptElementBase,
+                           public nsIDOMSVGScriptElement, 
+                           public nsIDOMSVGURIReference,
+                           public nsIScriptLoaderObserver,
+                           public nsIScriptElement
+{
+protected:
+  friend nsresult NS_NewSVGScriptElement(nsIContent **aResult,
+                                         nsINodeInfo *aNodeInfo);
+  nsSVGScriptElement(nsINodeInfo *aNodeInfo);
+  virtual ~nsSVGScriptElement();
+  virtual nsresult Init();
+  
+public:
+  // interfaces:
+  
+  NS_DECL_ISUPPORTS_INHERITED
+  NS_DECL_NSIDOMSVGSCRIPTELEMENT
+  NS_DECL_NSIDOMSVGURIREFERENCE
+  NS_DECL_NSISCRIPTLOADEROBSERVER
+
+  // xxx If xpcom allowed virtual inheritance we wouldn't need to
+  // forward here :-(
+  NS_FORWARD_NSIDOMNODE_NO_CLONENODE(nsSVGScriptElementBase::)
+  NS_FORWARD_NSIDOMELEMENT(nsSVGScriptElementBase::)
+  NS_FORWARD_NSIDOMSVGELEMENT(nsSVGScriptElementBase::)
+
+  // nsIScriptElement
+  virtual void GetScriptType(nsAString& type);
+  virtual already_AddRefed<nsIURI> GetScriptURI();
+  virtual void GetScriptText(nsAString& text);
+  virtual void GetScriptCharset(nsAString& charset); 
+  virtual void SetScriptLineNumber(PRUint32 aLineNumber);
+  virtual PRUint32 GetScriptLineNumber();
+
+  // nsISVGValueObserver specializations:
+  NS_IMETHOD DidModifySVGObservable (nsISVGValue* observable);
+
+  // nsIContent specializations:
+  virtual void SetDocument(nsIDocument* aDocument, PRBool aDeep,
+                           PRBool aCompileEventHandlers);
+  virtual nsresult InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
+                                 PRBool aNotify, PRBool aDeepSetDocument);
+  virtual nsresult AppendChildTo(nsIContent* aKid, PRBool aNotify,
+                                 PRBool aDeepSetDocument);
+    
+protected:
+  /**
+   * Processes the script if it's in the document-tree and links to or
+   * contains a script. Once it has been evaluated there is no way to make it
+   * reevaluate the script, you'll have to create a new element. This also means
+   * that when adding a href attribute to an element that already contains an
+   * inline script, the script referenced by the src attribute will not be
+   * loaded.
+   *
+   * In order to be able to use multiple childNodes, or to use the
+   * fallback-mechanism of using both inline script and linked script you have
+   * to add all attributes and childNodes before adding the element to the
+   * document-tree.
+   */
+  void MaybeProcessScript();
+  
+  nsCOMPtr<nsIDOMSVGAnimatedString> mHref;
+  PRUint32 mLineNumber;
+  PRPackedBool mIsEvaluated;
+  PRPackedBool mEvaluating;
+};
+
+NS_IMPL_NS_NEW_SVG_ELEMENT(Script)
+
+//----------------------------------------------------------------------
+// nsISupports methods
+
+NS_IMPL_ADDREF_INHERITED(nsSVGScriptElement,nsSVGScriptElementBase)
+NS_IMPL_RELEASE_INHERITED(nsSVGScriptElement,nsSVGScriptElementBase)
+
+NS_INTERFACE_MAP_BEGIN(nsSVGScriptElement)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMNode)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMElement)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMSVGElement)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMSVGScriptElement)
+  NS_INTERFACE_MAP_ENTRY(nsIDOMSVGURIReference)
+  NS_INTERFACE_MAP_ENTRY(nsIScriptLoaderObserver)
+  NS_INTERFACE_MAP_ENTRY(nsIScriptElement)
+  NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGScriptElement)
+NS_INTERFACE_MAP_END_INHERITING(nsSVGScriptElementBase)
+
+//----------------------------------------------------------------------
+// Implementation
+
+nsSVGScriptElement::nsSVGScriptElement(nsINodeInfo *aNodeInfo)
+  : nsSVGScriptElementBase(aNodeInfo),
+    mLineNumber(0),
+    mIsEvaluated(PR_FALSE),
+    mEvaluating(PR_FALSE)
+{
+
+}
+
+nsSVGScriptElement::~nsSVGScriptElement()
+{
+}
+
+  
+nsresult
+nsSVGScriptElement::Init()
+{
+  nsresult rv;
+
+  // nsIDOMSVGURIReference properties
+
+  // DOM property: href , #REQUIRED attrib: xlink:href
+  // XXX: enforce requiredness
+  {
+    rv = NS_NewSVGAnimatedString(getter_AddRefs(mHref));
+    NS_ENSURE_SUCCESS(rv,rv);
+    rv = AddMappedSVGValue(nsSVGAtoms::href, mHref, kNameSpaceID_XLink);
+    NS_ENSURE_SUCCESS(rv,rv);
+  }
+
+  return NS_OK;
+}
+
+//----------------------------------------------------------------------
+// nsIDOMNode methods
+
+NS_IMPL_SVG_DOM_CLONENODE(Script)
+
+//----------------------------------------------------------------------
+// nsIDOMSVGScriptElement methods
+
+/* attribute DOMString type; */
+NS_IMETHODIMP
+nsSVGScriptElement::GetType(nsAString & aType)
+{
+  return GetAttr(kNameSpaceID_None, nsSVGAtoms::type, aType);
+}
+NS_IMETHODIMP
+nsSVGScriptElement::SetType(const nsAString & aType)
+{
+  NS_ERROR("write me!");
+  return NS_ERROR_NOT_IMPLEMENTED;
+}
+
+//----------------------------------------------------------------------
+// nsIDOMSVGURIReference methods
+
+/* readonly attribute nsIDOMSVGAnimatedString href; */
+NS_IMETHODIMP
+nsSVGScriptElement::GetHref(nsIDOMSVGAnimatedString * *aHref)
+{
+  *aHref = mHref;
+  NS_IF_ADDREF(*aHref);
+  return NS_OK;
+}
+
+//----------------------------------------------------------------------
+// nsIScriptLoaderObserver methods
+
+// variation of this code in nsHTMLScriptElement - check if changes
+// need to be transfered when modifying
+
+/* void scriptAvailable (in nsresult aResult, in nsIScriptElement aElement , in nsIURI aURI, in PRInt32 aLineNo, in PRUint32 aScriptLength, [size_is (aScriptLength)] in wstring aScript); */
+NS_IMETHODIMP
+nsSVGScriptElement::ScriptAvailable(nsresult aResult,
+                                    nsIScriptElement *aElement,
+                                    PRBool aIsInline,
+                                    PRBool aWasPending,
+                                    nsIURI *aURI,
+                                    PRInt32 aLineNo,
+                                    const nsAString& aScript)
+{
+  if (!aIsInline && NS_FAILED(aResult)) {
+    nsCOMPtr<nsIPresContext> presContext;
+    if (mDocument) {
+      nsIPresShell *presShell = mDocument->GetShellAt(0);
+      if (presShell)
+        presShell->GetPresContext(getter_AddRefs(presContext));
+    }
+
+    nsEventStatus status = nsEventStatus_eIgnore;
+    nsScriptErrorEvent event(NS_SCRIPT_ERROR);
+
+    event.lineNr = aLineNo;
+
+    NS_NAMED_LITERAL_STRING(errorString, "Error loading script");
+    event.errorMsg = errorString.get();
+
+    nsCAutoString spec;
+    aURI->GetSpec(spec);
+
+    NS_ConvertUTF8toUCS2 fileName(spec);
+    event.fileName = fileName.get();
+
+    HandleDOMEvent(presContext, &event, nsnull, NS_EVENT_FLAG_INIT,
+                   &status);
+  }
+
+  return NS_OK;
+}
+
+// variation of this code in nsHTMLScriptElement - check if changes
+// need to be transfered when modifying
+
+/* void scriptEvaluated (in nsresult aResult, in nsIScriptElement aElement); */
+NS_IMETHODIMP
+nsSVGScriptElement::ScriptEvaluated(nsresult aResult,
+                                    nsIScriptElement *aElement,
+                                    PRBool aIsInline,
+                                    PRBool aWasPending)
+{
+  nsresult rv = NS_OK;
+  if (!aIsInline) {
+    nsCOMPtr<nsIPresContext> presContext;
+    if (mDocument) {
+      nsIPresShell *presShell = mDocument->GetShellAt(0);
+      if (presShell)
+        presShell->GetPresContext(getter_AddRefs(presContext));
+    }
+
+    nsEventStatus status = nsEventStatus_eIgnore;
+    nsEvent event(NS_SUCCEEDED(aResult) ? NS_SCRIPT_LOAD : NS_SCRIPT_ERROR);
+    rv = HandleDOMEvent(presContext, &event, nsnull, NS_EVENT_FLAG_INIT,
+                        &status);
+  }
+
+  return rv;
+}
+
+//----------------------------------------------------------------------
+// nsIScriptElement methods
+
+void
+nsSVGScriptElement::GetScriptType(nsAString& type)
+{
+  GetType(type);
+}
+
+// variation of this code in nsHTMLScriptElement - check if changes
+// need to be transfered when modifying
+
+already_AddRefed<nsIURI>
+nsSVGScriptElement::GetScriptURI()
+{
+  nsIURI *uri = nsnull;
+  nsAutoString src;
+  mHref->GetAnimVal(src);
+  if (!src.IsEmpty())
+    NS_NewURI(&uri, src);
+  return uri;
+}
+
+void
+nsSVGScriptElement::GetScriptText(nsAString& text)
+{
+  GetContentsAsText(text);
+}
+
+void
+nsSVGScriptElement::GetScriptCharset(nsAString& charset)
+{
+  charset.Truncate();
+}
+
+void 
+nsSVGScriptElement::SetScriptLineNumber(PRUint32 aLineNumber)
+{
+  mLineNumber = aLineNumber;
+}
+
+PRUint32
+nsSVGScriptElement::GetScriptLineNumber()
+{
+  return mLineNumber;
+}
+
+
+//----------------------------------------------------------------------
+// nsISVGValueObserver methods
+
+NS_IMETHODIMP
+nsSVGScriptElement::DidModifySVGObservable(nsISVGValue* aObservable)
+{
+  nsresult rv = nsSVGScriptElementBase::DidModifySVGObservable(aObservable);
+  
+  // if aObservable==mHref:
+  MaybeProcessScript();
+  
+  return rv;
+}
+
+//----------------------------------------------------------------------
+// nsIContent methods
+
+void
+nsSVGScriptElement::SetDocument(nsIDocument* aDocument, PRBool aDeep,
+                                PRBool aCompileEventHandlers)
+{
+  nsSVGScriptElementBase::SetDocument(aDocument, aDeep, aCompileEventHandlers);
+  if (aDocument) {
+    MaybeProcessScript();
+  }
+}
+
+nsresult
+nsSVGScriptElement::InsertChildAt(nsIContent* aKid, PRUint32 aIndex,
+                                  PRBool aNotify, PRBool aDeepSetDocument)
+{
+  nsresult rv = nsSVGScriptElementBase::InsertChildAt(aKid, aIndex, aNotify,
+                                                      aDeepSetDocument);
+  if (NS_SUCCEEDED(rv) && aNotify) {
+    MaybeProcessScript();
+  }
+
+  return rv;
+}
+
+nsresult
+nsSVGScriptElement::AppendChildTo(nsIContent* aKid, PRBool aNotify,
+                                  PRBool aDeepSetDocument)
+{
+  nsresult rv = nsSVGScriptElementBase::AppendChildTo(aKid, aNotify,
+                                                      aDeepSetDocument);
+  if (NS_SUCCEEDED(rv) && aNotify) {
+    MaybeProcessScript();
+  }
+
+  return rv;
+}
+
+//----------------------------------------------------------------------
+// implementation helpers
+
+// variation of this code in nsHTMLScriptElement - check if changes
+// need to be transfered when modifying
+void
+nsSVGScriptElement::MaybeProcessScript()
+{
+  if (mIsEvaluated || mEvaluating || !mDocument || !GetParent()) {
+    return;
+  }
+
+  // We'll always call this to make sure that
+  // ScriptAvailable/ScriptEvaluated gets called. See bug 153600
+  nsresult rv = NS_OK;
+  nsCOMPtr<nsIScriptLoader> loader = mDocument->GetScriptLoader();
+  if (loader) {
+    mEvaluating = PR_TRUE;
+    rv = loader->ProcessScriptElement(this, this);
+    mEvaluating = PR_FALSE;
+  }
+
+  // But we'll only set mIsEvaluated if we did really load or evaluate
+  // something
+  if (HasAttr(kNameSpaceID_XLink, nsSVGAtoms::href) ||
+      mAttrsAndChildren.ChildCount()) {
+    mIsEvaluated = PR_TRUE;
+  }
+}
diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
index 34398118af1..5f036c571de 100644
--- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp
+++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp
@@ -60,7 +60,6 @@
 #include "nsIDOMCDATASection.h"
 #include "nsDOMDocumentType.h"
 #include "nsIHTMLContent.h"
-#include "nsIDOMHTMLScriptElement.h"
 #include "nsHTMLParts.h"
 #include "nsVoidArray.h"
 #include "nsCRT.h"
@@ -99,6 +98,10 @@
 #include "nsNodeInfoManager.h"
 #include "nsContentCreatorFunctions.h"
 
+#ifdef MOZ_SVG
+#include "nsSVGAtoms.h"
+#endif
+
 static const char kNameSpaceSeparator = ':';
 #define kXSLType "text/xsl"
 
@@ -442,6 +445,18 @@ nsXMLContentSink::CreateElement(const PRUnichar** aAtts, PRUint32 aAttsCount,
                      aNodeInfo);
   NS_ENSURE_SUCCESS(rv, rv);
 
+  if (aNodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XHTML)
+#ifdef MOZ_SVG
+      || aNodeInfo->Equals(nsSVGAtoms::script, kNameSpaceID_SVG)
+#endif
+    ) {
+    // Don't append the content to the tree until we're all
+    // done collecting its contents
+    mConstrainSize = PR_FALSE;
+    mScriptLineNo = aLineNumber;
+    *aAppendContent = PR_FALSE;
+  }
+
   // XHTML needs some special attention
   if (aNodeInfo->NamespaceEquals(kNameSpaceID_XHTML)) {
     mPrettyPrintHasFactoredElements = PR_TRUE;
@@ -462,14 +477,7 @@ nsXMLContentSink::CreateElement(const PRUnichar** aAtts, PRUint32 aAttsCount,
     }
   }
 
-  if (aNodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XHTML)) {
-    // Don't append the content to the tree until we're all
-    // done collecting its contents
-    mConstrainSize = PR_FALSE;
-    mScriptLineNo = aLineNumber;
-    *aAppendContent = PR_FALSE;
-  }
-  else if (aNodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML)) {
+  if (aNodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML)) {
     if (mTitleText.IsEmpty()) {
       mInTitle = PR_TRUE; // The first title wins
     }
@@ -523,11 +531,17 @@ nsXMLContentSink::CloseElement(nsIContent* aContent, PRBool* aAppendContent)
 
   nsresult rv = NS_OK;
 
-  if (nodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XHTML)) {
+  if (nodeInfo->Equals(nsHTMLAtoms::script, kNameSpaceID_XHTML)
+#ifdef MOZ_SVG
+      || nodeInfo->Equals(nsSVGAtoms::script, kNameSpaceID_SVG)
+#endif
+    ) {
     rv = ProcessEndSCRIPTTag(aContent);
     *aAppendContent = PR_TRUE;
+    return rv;
   }
-  else if (nodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML) &&
+  
+  if (nodeInfo->Equals(nsHTMLAtoms::title, kNameSpaceID_XHTML) &&
            mInTitle) {
     // The first title wins
     nsCOMPtr<nsIDOMNSDocument> dom_doc(do_QueryInterface(mDocument));
@@ -1497,14 +1511,11 @@ nsXMLContentSink::ProcessEndSCRIPTTag(nsIContent* aContent)
 {
   nsresult result = NS_OK;
 
-  nsCOMPtr<nsIDOMHTMLScriptElement> scriptElement(do_QueryInterface(aContent));
+  nsCOMPtr<nsIScriptElement> scriptElement(do_QueryInterface(aContent));
   NS_ASSERTION(scriptElement, "null script element in XML content sink");
   mScriptElements.AppendObject(scriptElement);
 
-  nsCOMPtr<nsIScriptElement> sele(do_QueryInterface(aContent));
-  if (sele) {
-    sele->SetLineNumber(mScriptLineNo);
-  }
+  scriptElement->SetScriptLineNumber(mScriptLineNo);
 
   mConstrainSize = PR_TRUE; 
   // Assume that we're going to block the parser with a script load.
diff --git a/mozilla/dom/public/idl/svg/Makefile.in b/mozilla/dom/public/idl/svg/Makefile.in
index 5f76cf007cf..befff36721e 100644
--- a/mozilla/dom/public/idl/svg/Makefile.in
+++ b/mozilla/dom/public/idl/svg/Makefile.in
@@ -85,6 +85,7 @@ XPIDLSRCS	= \
 		nsIDOMSVGPresAspectRatio.idl \
 		nsIDOMSVGRect.idl \
 		nsIDOMSVGRectElement.idl \
+		nsIDOMSVGScriptElement.idl \
 		nsIDOMSVGSVGElement.idl \
 		nsIDOMSVGStylable.idl \
 		nsIDOMSVGStyleElement.idl \
diff --git a/mozilla/dom/public/idl/svg/nsIDOMSVGScriptElement.idl b/mozilla/dom/public/idl/svg/nsIDOMSVGScriptElement.idl
new file mode 100644
index 00000000000..40c88386e1d
--- /dev/null
+++ b/mozilla/dom/public/idl/svg/nsIDOMSVGScriptElement.idl
@@ -0,0 +1,58 @@
+/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* ----- BEGIN LICENSE BLOCK -----
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is the Mozilla SVG project.
+ *
+ * The Initial Developer of the Original Code is 
+ * Crocodile Clips Ltd..
+ * Portions created by the Initial Developer are Copyright (C) 2001
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ *    Alex Fritze <alex@croczilla.com> (original author)
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either the GNU General Public License Version 2 or later (the "GPL"), or 
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the NPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ----- END LICENSE BLOCK ----- */
+
+#include "nsIDOMSVGElement.idl"
+
+[scriptable, uuid(bbe0d0ee-e9ed-4f84-a6e4-e58f66530caa)]
+interface nsIDOMSVGScriptElement
+  : nsIDOMSVGElement
+/*
+        The SVG DOM makes use of multiple interface inheritance.
+        Since XPCOM only supports single interface inheritance,
+        the best thing that we can do is to promise that whenever
+        an object implements _this_ interface it will also
+        implement the following interfaces. (We then have to QI to
+        hop between them.)
+        
+    nsIDOMSVGURIReference,
+    nsIDOMSVGExternalResourcesRequired
+*/
+{ 
+  attribute DOMString         type;
+      // raises DOMException on setting
+};
diff --git a/mozilla/dom/public/nsIDOMClassInfo.h b/mozilla/dom/public/nsIDOMClassInfo.h
index 0f0e4248b8b..acb68d6b981 100644
--- a/mozilla/dom/public/nsIDOMClassInfo.h
+++ b/mozilla/dom/public/nsIDOMClassInfo.h
@@ -293,6 +293,7 @@ enum nsDOMClassInfoID {
   eDOMClassInfo_SVGStyleElement_id,
   eDOMClassInfo_SVGAnimatedPreserveAspectRatio_id,
   eDOMClassInfo_SVGPreserveAspectRatio_id,
+  eDOMClassInfo_SVGScriptElement_id,
 #endif //MOZ_SVG
   
   // This one better be the last one in this list
diff --git a/mozilla/dom/src/base/nsDOMClassInfo.cpp b/mozilla/dom/src/base/nsDOMClassInfo.cpp
index 42827e77b45..6a75637c3d6 100644
--- a/mozilla/dom/src/base/nsDOMClassInfo.cpp
+++ b/mozilla/dom/src/base/nsDOMClassInfo.cpp
@@ -338,6 +338,7 @@
 #include "nsIDOMSVGStyleElement.h"
 #include "nsIDOMSVGStylable.h"
 #include "nsIDOMSVGDefsElement.h"
+#include "nsIDOMSVGScriptElement.h"
 #endif
 
 #include "nsIImageDocument.h"
@@ -889,6 +890,8 @@ static nsDOMClassInfoData sClassInfoData[] = {
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
   NS_DEFINE_CLASSINFO_DATA(SVGPreserveAspectRatio, nsDOMGenericSH,
                            DOM_DEFAULT_SCRIPTABLE_FLAGS)
+  NS_DEFINE_CLASSINFO_DATA(SVGScriptElement, nsElementSH,
+                           ELEMENT_SCRIPTABLE_FLAGS)  
 #endif  
 };
 
@@ -2375,6 +2378,12 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGPreserveAspectRatio)
   DOM_CLASSINFO_MAP_END
 
+  DOM_CLASSINFO_MAP_BEGIN(SVGScriptElement, nsIDOMSVGScriptElement)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGScriptElement)
+    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGURIReference)
+    DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES
+  DOM_CLASSINFO_MAP_END
+
 #endif //MOZ_SVG
 
 #ifdef NS_DEBUG
diff --git a/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.cpp b/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.cpp
index 3cbce6fc780..8e76e7bc113 100644
--- a/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.cpp
@@ -49,7 +49,7 @@
 #include "nsIDOMProcessingInstruction.h"
 #include "nsIDOMText.h"
 #include "nsIDOMHTMLTableSectionElem.h"
-#include "nsIDOMHTMLScriptElement.h"
+#include "nsIScriptElement.h"
 #include "nsIDOMNSDocument.h"
 #include "nsIParser.h"
 #include "nsIRefreshURI.h"
@@ -264,6 +264,15 @@ void txMozillaXMLOutput::endElement(const nsAString& aName, const PRInt32 aNsID)
         endHTMLElement(element);
     }
 
+    // Handle svg script elements
+    if (aNsID == kNameSpaceID_SVG && txHTMLAtoms::script->Equals(aName)) {
+        // Add this script element to the array of loading script elements.
+        nsCOMPtr<nsIScriptElement> scriptElement =
+            do_QueryInterface(mCurrentNode);
+        NS_ASSERTION(scriptElement, "Need script element");
+        mNotifier->AddScriptElement(scriptElement);
+    }
+
     if (mCreatingNewDocument) {
         // Handle all sorts of stylesheets
         nsCOMPtr<nsIStyleSheetLinkingElement> ssle =
@@ -428,8 +437,12 @@ void txMozillaXMLOutput::startElement(const nsAString& aName,
             return;
         }
 
-        if (aNsID == kNameSpaceID_XHTML)
+        if (aNsID == kNameSpaceID_XHTML) {
             startHTMLElement(element, PR_TRUE);
+        } else if (aNsID == kNameSpaceID_SVG &&
+                   txHTMLAtoms::script->Equals(aName)) {
+            mDontAddCurrent = PR_TRUE;
+        }
     }
 
     if (mCreatingNewDocument) {
@@ -619,7 +632,7 @@ void txMozillaXMLOutput::endHTMLElement(nsIDOMElement* aElement)
     // Load scripts
     if (mNotifier && atom == txHTMLAtoms::script) {
         // Add this script element to the array of loading script elements.
-        nsCOMPtr<nsIDOMHTMLScriptElement> scriptElement =
+        nsCOMPtr<nsIScriptElement> scriptElement =
             do_QueryInterface(mCurrentNode);
         NS_ASSERTION(scriptElement, "Need script element");
         mNotifier->AddScriptElement(scriptElement);
@@ -816,7 +829,7 @@ NS_IMPL_ISUPPORTS2(txTransformNotifier,
 
 NS_IMETHODIMP
 txTransformNotifier::ScriptAvailable(nsresult aResult, 
-                                     nsIDOMHTMLScriptElement *aElement, 
+                                     nsIScriptElement *aElement, 
                                      PRBool aIsInline,
                                      PRBool aWasPending,
                                      nsIURI *aURI, 
@@ -833,7 +846,7 @@ txTransformNotifier::ScriptAvailable(nsresult aResult,
 
 NS_IMETHODIMP 
 txTransformNotifier::ScriptEvaluated(nsresult aResult, 
-                                     nsIDOMHTMLScriptElement *aElement,
+                                     nsIScriptElement *aElement,
                                      PRBool aIsInline,
                                      PRBool aWasPending)
 {
@@ -864,7 +877,7 @@ txTransformNotifier::Init(nsITransformObserver* aObserver)
 }
 
 void
-txTransformNotifier::AddScriptElement(nsIDOMHTMLScriptElement* aElement)
+txTransformNotifier::AddScriptElement(nsIScriptElement* aElement)
 {
     mScriptElements.AppendObject(aElement);
 }
diff --git a/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h b/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h
index eb00e8fc982..2b8769f468c 100644
--- a/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h
+++ b/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h
@@ -70,7 +70,7 @@ public:
     NS_IMETHOD StyleSheetLoaded(nsICSSStyleSheet* aSheet, PRBool aNotify);
 
     void Init(nsITransformObserver* aObserver);
-    void AddScriptElement(nsIDOMHTMLScriptElement* aElement);
+    void AddScriptElement(nsIScriptElement* aElement);
     void AddStyleSheet(nsIStyleSheet* aStyleSheet);
     void OnTransformEnd();
     void OnTransformStart();
@@ -81,7 +81,7 @@ private:
 
     nsCOMPtr<nsIDOMDocument> mDocument;
     nsCOMPtr<nsITransformObserver> mObserver;
-    nsCOMArray<nsIDOMHTMLScriptElement> mScriptElements;
+    nsCOMArray<nsIScriptElement> mScriptElements;
     nsCOMArray<nsIStyleSheet> mStylesheets;
     PRPackedBool mInTransform;
 };