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

292357 nsFrameLoader should use the content's base URI, not the document's

Browse Source 
r+sr=bz a=asa
This commit is contained in:
cbiesinger@web.de
2005-05-01 13:06:48 +00:00
parent 2e9bd0816c
commit 7eb11a486b
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
content/base/src/nsFrameLoader.cpp
View File

@@ -108,15 +108,13 @@ nsFrameLoader::LoadFrame()
src.AssignLiteral("about:blank");
}
// Make an absolute URI
nsIURI *base_uri = doc->GetBaseURI();
const nsACString &doc_charset = doc->GetDocumentCharacterSet();
nsCOMPtr<nsIURI> base_uri = mOwnerContent->GetBaseURI();
const nsAFlatCString &doc_charset = doc->GetDocumentCharacterSet();
nsCOMPtr<nsIURI> uri;
rv = NS_NewURI(getter_AddRefs(uri), src,
doc_charset.IsEmpty() ? nsnull :
PromiseFlatCString(doc_charset).get(), base_uri);
doc_charset.IsEmpty() ? nsnull : doc_charset.get(),
base_uri);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIDocShellLoadInfo> loadInfo;