Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set referrer correctly when a document is loaded by setting

Browse Source 
location.href. Bug 109319, r=fabian, sr=jst
This commit is contained in:
bzbarsky%mit.edu 2001-11-17 17:26:18 +00:00
parent f952b3568d
commit 3c061c454a
2 changed files with 49 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dom/src/base/nsGlobalWindow.h
View File

@ -383,8 +383,10 @@ protected:
nsresult SetHrefWithContext(JSContext* cx, const nsAReadableString& aHref,
PRBool aReplace);
nsresult GetSourceURL(JSContext* cx,
nsIURI** sourceURL);
nsresult GetSourceURL(JSContext* cx, nsIURI** sourceURL);
nsresult GetSourceBaseURL(JSContext* cx, nsIURI** sourceURL);
nsresult GetSourceDocument(JSContext* cx, nsIDocument** aDocument);
nsresult CheckURL(nsIURI *url, nsIDocShellLoadInfo** aLoadInfo);
nsIDocShell *mDocShell; // Weak Reference

60
dom/src/base/nsLocation.cpp
View File

@ -217,6 +217,13 @@ LocationImpl::CheckURL(nsIURI* aURI, nsIDocShellLoadInfo** aLoadInfo)
nsCOMPtr<nsISupports> owner = do_QueryInterface(principal);
loadInfo->SetOwner(owner);
// now set the referrer on the loadinfo
nsCOMPtr<nsIURI> sourceURI;
GetSourceURL(cx, getter_AddRefs(sourceURI));
if (sourceURI) {
loadInfo->SetReferrer(sourceURI);
}
*aLoadInfo = loadInfo.get();
NS_ADDREF(*aLoadInfo);
@ -485,7 +492,7 @@ LocationImpl::SetHrefWithContext(JSContext* cx, const nsAReadableString& aHref,
nsCOMPtr<nsIURI> base;
// Get the source of the caller
nsresult result = GetSourceURL(cx, getter_AddRefs(base));
nsresult result = GetSourceBaseURL(cx, getter_AddRefs(base));
if (NS_FAILED(result)) {
return result;
@ -912,7 +919,7 @@ LocationImpl::ToString(nsAWritableString& aReturn)
}
nsresult
LocationImpl::GetSourceURL(JSContext* cx, nsIURI** sourceURI)
LocationImpl::GetSourceDocument(JSContext* cx, nsIDocument** aDocument)
{
// XXX Code duplicated from nsHTMLDocument
// XXX Tom said this reminded him of the "Six Degrees of
@ -932,25 +939,48 @@ LocationImpl::GetSourceURL(JSContext* cx, nsIURI** sourceURI)
nsJSUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(nativeGlob));
if (nativeGlob) {
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(nativeGlob);
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(nativeGlob, &result);
if (window) {
nsCOMPtr<nsIDOMDocument> domDoc;
result = window->GetDocument(getter_AddRefs(domDoc));
if (NS_SUCCEEDED(result)) {
nsCOMPtr<nsIDocument> doc(do_QueryInterface(domDoc));
if (doc) {
result = doc->GetBaseURL(*sourceURI);
if (!*sourceURI) {
doc->GetDocumentURL(sourceURI);
}
}
if (domDoc) {
return CallQueryInterface(domDoc, aDocument);
}
}
} else {
*aDocument = nsnull;
}
return result;
}
nsresult
LocationImpl::GetSourceBaseURL(JSContext* cx, nsIURI** sourceURL)
{
nsCOMPtr<nsIDocument> doc;
nsresult rv = GetSourceDocument(cx, getter_AddRefs(doc));
if (doc) {
rv = doc->GetBaseURL(*sourceURL);
if (!*sourceURL) {
doc->GetDocumentURL(sourceURL);
}
} else {
*sourceURL = nsnull;
}
return rv;
}
nsresult
LocationImpl::GetSourceURL(JSContext* cx, nsIURI** sourceURL)
{
nsCOMPtr<nsIDocument> doc;
nsresult rv = GetSourceDocument(cx, getter_AddRefs(doc));
if (doc) {
doc->GetDocumentURL(sourceURL);
} else {
*sourceURL = nsnull;
}
return rv;
}