Removing a nasty shortcut that I left in when fixing bug 116834. r=rginda@netscape.com, sr=blaker@netscape.com

content/xbl/src/nsXBLDocumentInfo.cpp

@@ -41,7 +41,7 @@ public:
                             nsEventStatus* aEventStatus);
   NS_IMETHOD_(JSObject *) GetGlobalJSObject();
   NS_IMETHOD OnFinalize(JSObject *aObject);
-  NS_IMETHOD SetScriptsEnabled(PRBool aEnabled);
+  NS_IMETHOD SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts);
 
   // nsIScriptObjectPrincipal methods
   NS_IMETHOD GetPrincipal(nsIPrincipal** aPrincipal);
@@ -270,7 +270,7 @@ nsXBLDocGlobalObject::OnFinalize(JSObject *aObject)
 }
 
 NS_IMETHODIMP
-nsXBLDocGlobalObject::SetScriptsEnabled(PRBool aEnabled)
+nsXBLDocGlobalObject::SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts)
 {
     // We don't care...
 

content/xul/document/src/nsXULPrototypeDocument.cpp

@@ -98,7 +98,7 @@ public:
                               nsEventStatus* aEventStatus);
     NS_IMETHOD_(JSObject *) GetGlobalJSObject();
     NS_IMETHOD OnFinalize(JSObject *aObject);
-    NS_IMETHOD SetScriptsEnabled(PRBool aEnabled);
+    NS_IMETHOD SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts);
 
     // nsIScriptObjectPrincipal methods
     NS_IMETHOD GetPrincipal(nsIPrincipal** aPrincipal);
@@ -727,7 +727,7 @@ nsXULPDGlobalObject::OnFinalize(JSObject *aObject)
 }
 
 NS_IMETHODIMP
-nsXULPDGlobalObject::SetScriptsEnabled(PRBool aEnabled)
+nsXULPDGlobalObject::SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts)
 {
     // We don't care...
 

dom/public/nsIScriptGlobalObject.h

@@ -105,7 +105,7 @@ public:
   /**
    * Called when scripts are enabled/disabled.
    */
-  NS_IMETHOD SetScriptsEnabled(PRBool aEnabled) = 0;
+  NS_IMETHOD SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts) = 0;
 };
 
 #endif

dom/src/base/nsGlobalWindow.cpp

@@ -704,9 +704,9 @@ GlobalWindowImpl::OnFinalize(JSObject *aJSObject)
 }
 
 NS_IMETHODIMP
-GlobalWindowImpl::SetScriptsEnabled(PRBool aEnabled)
+GlobalWindowImpl::SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts)
 {
-  if (aEnabled) {
+  if (aEnabled && aFireTimeouts) {
     // Scripts are enabled (again?) on this context, run timeouts that
     // fired on this context while scripts were disabled.
 

dom/src/base/nsGlobalWindow.h

@@ -137,7 +137,7 @@ public:
                             nsEventStatus* aEventStatus);
   NS_IMETHOD_(JSObject *) GetGlobalJSObject();
   NS_IMETHOD OnFinalize(JSObject *aJSObject);
-  NS_IMETHOD SetScriptsEnabled(PRBool aEnabled);
+  NS_IMETHOD SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts);
 
   // nsIScriptObjectPrincipal
   NS_IMETHOD GetPrincipal(nsIPrincipal **prin);

dom/src/base/nsJSEnvironment.cpp

@@ -1522,13 +1522,11 @@ nsJSContext::SetScriptsEnabled(PRBool aEnabled, PRBool aFireTimeouts)
 {
   mScriptsEnabled = aEnabled;
 
-  if (aFireTimeouts) {
-    nsCOMPtr<nsIScriptGlobalObject> global;
-    GetGlobalObject(getter_AddRefs(global));
+  nsCOMPtr<nsIScriptGlobalObject> global;
+  GetGlobalObject(getter_AddRefs(global));
 
-    if (global) {
-      global->SetScriptsEnabled(aEnabled);
-    }
+  if (global) {
+    global->SetScriptsEnabled(aEnabled, aFireTimeouts);
   }
 
   return NS_OK;