Make STOP_CONTENT not only stop the content viewer, but also cancel all pending

timeouts and intervals. Bug 277092, r+sr=jst git-svn-id: svn://10.0.0.236/trunk@168587 18797224-902f-48f8-a5cc-f745e15eee43
2005-01-31 22:49:42 +00:00
parent 3a76aa2079
commit 3040cb0efe
3 changed files with 11 additions and 3 deletions
--- a/mozilla/docshell/base/nsDocShell.cpp
+++ b/mozilla/docshell/base/nsDocShell.cpp
@@ -3115,6 +3115,10 @@ nsDocShell::Stop(PRUint32 aStopFlags)
    if (nsIWebNavigation::STOP_CONTENT & aStopFlags) {
        if (mContentViewer)
            mContentViewer->Stop();
+        nsCOMPtr<nsPIDOMWindow> ourWindow = do_QueryInterface(mScriptGlobal);
+        if (ourWindow) {
+            ourWindow->ClearAllTimeouts();
+        }
    }

    if (nsIWebNavigation::STOP_NETWORK & aStopFlags) {