Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 05:15:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make nsXULDocument use the post-redirect URI as the document URI for non-chrome

Browse Source 
and non-resource channels, the way all other documents do.  Bug 240358, r+sr=jst
This commit is contained in:
bzbarsky%mit.edu 2004-04-13 18:02:28 +00:00
parent 9525428ff4
commit 81f0149ebe
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
content/xul/document/src/nsXULDocument.cpp
View File

@ -539,7 +539,19 @@ nsXULDocument::StartDocumentLoad(const char* aCommand, nsIChannel* aChannel,
mDocumentTitle.Truncate();
nsresult rv = aChannel->GetOriginalURI(getter_AddRefs(mDocumentURI));
if (NS_FAILED(rv)) return rv;
NS_ENSURE_SUCCESS(rv, rv);
// XXXbz this code is repeated from nsDocument::Reset; we
// really need to refactor this part better.
PRBool isChrome = PR_FALSE;
PRBool isRes = PR_FALSE;
rv = mDocumentURI->SchemeIs("chrome", &isChrome);
rv |= mDocumentURI->SchemeIs("resource", &isRes);
if (NS_SUCCEEDED(rv) && !isChrome && !isRes) {
rv = aChannel->GetURI(getter_AddRefs(mDocumentURI));
NS_ENSURE_SUCCESS(rv, rv);
}
rv = ResetStylesheetsToURI(mDocumentURI);
if (NS_FAILED(rv)) return rv;