Move resuming of timeouts to after we've restored the docshell hierarchy, so that they're restored correctly for subframes. Bug 305156, r=cbiesinger, sr=jst.

2005-08-25 07:06:59 +00:00
parent 98bba81e14
commit ffa1f0b5eb
4 changed files with 11 additions and 4 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -5389,6 +5389,10 @@ nsDocShell::RestoreFromHistory()
        }
    }

+    // Now that all of the child docshells have been put into place, we can
+    // restart the timers for the window and all of the child frames.
+    privWin->ResumeTimeouts();
+
    // Restore the refresh URI list.  The refresh timers will be restarted
    // when EndPageLoad() is called.
    mLSHE->GetRefreshURIList(getter_AddRefs(mRefreshURIList));