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

Bug 582795 - nsDocShell::LoadPage should assign a unique document identifier to its cloned SHEntry so changing charsets in view-source works. Also fixes bug 585298. r=bz a=blocking2.0

Browse Source
This commit is contained in:
Justin Lebar
2010-08-09 10:16:50 -07:00
parent 931fc05e2b
commit b048ed8082
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docshell/base/nsDocShell.cpp
View File

@@ -4299,7 +4299,7 @@ nsDocShell::GetSessionHistory(nsISHistory ** aSessionHistory)
//*****************************************************************************
// nsDocShell::nsIWebPageDescriptor
//*****************************************************************************
//*****************************************************************************
NS_IMETHODIMP
nsDocShell::LoadPage(nsISupports *aPageDescriptor, PRUint32 aDisplayType)
{
@@ -4315,7 +4315,13 @@ nsDocShell::LoadPage(nsISupports *aPageDescriptor, PRUint32 aDisplayType)
nsCOMPtr<nsISHEntry> shEntry;
nsresult rv = shEntryIn->Clone(getter_AddRefs(shEntry));
NS_ENSURE_SUCCESS(rv, rv);
// Give our cloned shEntry a new document identifier so this load is
// independent of all other loads. (This is important, in particular,
// for bugs 582795 and 585298.)
rv = shEntry->SetUniqueDocIdentifier();
NS_ENSURE_SUCCESS(rv, rv);
//
// load the page as view-source
//