Bug 775467 - Make readyState progress through all states without duplicate transitions. r=bzbarsky.

2012-07-27 16:35:09 +03:00
parent 11cb00a593
commit d1de4e669c
10 changed files with 66 additions and 7 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -7253,7 +7253,9 @@ nsDocShell::RestoreFromHistory()
    mLSHE->GetRefreshURIList(getter_AddRefs(refreshURIList));

    // Reattach to the window object.
+    mIsRestoringDocument = true; // for MediaDocument::BecomeInteractive
    rv = mContentViewer->Open(windowState, mLSHE);
+    mIsRestoringDocument = false;

    // Hack to keep nsDocShellEditorData alive across the
    // SetContentViewer(nsnull) call below.