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

Fix a few issues in bfcache and XBL when javascript is being toggled on and off. Bug 398668, r+sr+a=jst

Browse Source
This commit is contained in:
2007-10-05 17:35:00 -07:00
parent 42733730f8
commit 2a71a49259
4 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
docshell/base/nsDocShell.cpp
View File

@@ -5706,9 +5706,33 @@ nsDocShell::RestoreFromHistory()
// Now we simulate appending child docshells for subframes.
for (i = 0; i < childShells.Count(); ++i) {
nsIDocShellTreeItem *childItem = childShells.ObjectAt(i);
nsCOMPtr<nsIDocShell> childShell = do_QueryInterface(childItem);
// Make sure to not clobber the state of the child. Since AddChild
// always clobbers it, save it off first.
PRBool allowPlugins;
childShell->GetAllowPlugins(&allowPlugins);
PRBool allowJavascript;
childShell->GetAllowJavascript(&allowJavascript);
PRBool allowRedirects;
childShell->GetAllowMetaRedirects(&allowRedirects);
PRBool allowSubframes;
childShell->GetAllowSubframes(&allowSubframes);
PRBool allowImages;
childShell->GetAllowImages(&allowImages);
AddChild(childItem);
nsCOMPtr<nsIDocShell> childShell = do_QueryInterface(childItem);
childShell->SetAllowPlugins(allowPlugins);
childShell->SetAllowJavascript(allowJavascript);
childShell->SetAllowMetaRedirects(allowRedirects);
childShell->SetAllowSubframes(allowSubframes);
childShell->SetAllowImages(allowImages);
rv = childShell->BeginRestore(nsnull, PR_FALSE);
NS_ENSURE_SUCCESS(rv, rv);
}
@@ -6861,6 +6885,28 @@ nsDocShell::InternalLoad(nsIURI * aURI,
// If we have a saved content viewer in history, restore and show it now.
if (aSHEntry && (mLoadType & LOAD_CMD_HISTORY)) {
// It's possible that the previous viewer of mContentViewer is the
// viewer that will end up in aSHEntry when it gets closed. If that's
// the case, we need to go ahead and force it into its shentry so we
// can restore it.
if (mContentViewer) {
nsCOMPtr<nsIContentViewer> prevViewer;
mContentViewer->GetPreviousViewer(getter_AddRefs(prevViewer));
if (prevViewer) {
#ifdef DEBUG
nsCOMPtr<nsIContentViewer> prevPrevViewer;
prevViewer->GetPreviousViewer(getter_AddRefs(prevPrevViewer));
NS_ASSERTION(!prevPrevViewer, "Should never have viewer chain here");
#endif
nsCOMPtr<nsISHEntry> viewerEntry;
prevViewer->GetHistoryEntry(getter_AddRefs(viewerEntry));
if (viewerEntry == aSHEntry) {
// Make sure this viewer ends up in the right place
mContentViewer->SetPreviousViewer(nsnull);
prevViewer->Destroy();
}
}
}
nsCOMPtr<nsISHEntry> oldEntry = mOSHE;
PRBool restoring;
rv = RestorePresentation(aSHEntry, &restoring);