corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Back out changeset 0fd8793db7f3 (bug 633738) because of various oranges in different test suites on multiple platforms; a=orange

Browse Source
This commit is contained in:
Ehsan Akhgari
2011-02-14 18:45:23 -05:00
parent ea297b185d
commit d40406d8d1
7 changed files with 5 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
docshell/base/nsDocShell.cpp
View File

@@ -7054,11 +7054,6 @@ nsDocShell::RestoreFromHistory()
mContentViewer->Close(mSavingOldViewer ? mOSHE.get() : nsnull);
viewer->SetPreviousViewer(mContentViewer);
}
if (mOSHE && (!mContentViewer || !mSavingOldViewer)) {
// We don't plan to save a viewer in mOSHE; tell it to drop
// any other state it's holding.
mOSHE->SyncPresentationState();
}
// Order the mContentViewer setup just like Embed does.
mContentViewer = nsnull;
@@ -7676,14 +7671,9 @@ nsDocShell::SetupNewViewer(nsIContentViewer * aNewViewer)
mContentViewer->Close(mSavingOldViewer ? mOSHE.get() : nsnull);
aNewViewer->SetPreviousViewer(mContentViewer);
}
if (mOSHE && (!mContentViewer || !mSavingOldViewer)) {
// We don't plan to save a viewer in mOSHE; tell it to drop
// any other state it's holding.
mOSHE->SyncPresentationState();
}
mContentViewer = nsnull;
mContentViewer = nsnull;
}
// Now that we're about to switch documents, forget all of our children.
// Note that we cached them as needed up in CaptureState above.