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.

git-svn-id: svn://10.0.0.236/trunk@178919 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/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));