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

timeouts and intervals. Bug 277092, r+sr=jst
2005-01-31 22:49:42 +00:00
parent a2dc54d482
commit a1d12d3aa3
3 changed files with 11 additions and 3 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/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) {