Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

If we created a transient about:blank content viewer, make sure we're locating the root view sibling for that viewer and not the viewer it's replacing. Bug 300533, r=cbiesinger.

Browse Source
This commit is contained in:
bryner%brianryner.com 2005-08-24 17:27:41 +00:00
parent 1cd6d1c5c4
commit e5ed382220
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
docshell/base/nsDocShell.cpp
View File

@ -4736,7 +4736,7 @@ nsDocShell::EnsureDeviceContext()
return NS_OK;
}
NS_IMETHODIMP
nsresult
nsDocShell::CreateAboutBlankContentViewer()
{
nsCOMPtr<nsIDocument> blankDoc;
@ -4809,6 +4809,10 @@ nsDocShell::CreateAboutBlankContentViewer()
}
}
mCreatingDocument = PR_FALSE;
// The transient about:blank viewer doesn't have a session history entry.
SetHistoryEntry(&mOSHE, nsnull);
return rv;
}
@ -5213,6 +5217,21 @@ nsDocShell::RestoreFromHistory()
mSavedRefreshURIList = nsnull;
// In cases where we use a transient about:blank viewer between loads,
// we never show the transient viewer, so _its_ previous viewer is never
// unhooked from the view hierarchy. Destroy any such previous viewer now,
// before we grab the root view sibling, so that we don't grab a view
// that's about to go away.
if (mContentViewer) {
nsCOMPtr<nsIContentViewer> previousViewer;
mContentViewer->GetPreviousViewer(getter_AddRefs(previousViewer));
if (previousViewer) {
mContentViewer->SetPreviousViewer(nsnull);
previousViewer->Destroy();
}
}
// Save off the root view's parent and sibling so that we can insert the
// new content viewer's root view at the same position. Also save the
// bounds of the root view's widget.

2
docshell/base/nsDocShell.h
View File

@ -276,7 +276,7 @@ protected:
// Content Viewer Management
NS_IMETHOD EnsureContentViewer();
NS_IMETHOD EnsureDeviceContext();
NS_IMETHOD CreateAboutBlankContentViewer();
nsresult CreateAboutBlankContentViewer();
NS_IMETHOD CreateContentViewer(const char * aContentType,
nsIRequest * request, nsIStreamListener ** aContentHandler);
NS_IMETHOD NewContentViewerObj(const char * aContentType,