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

Fix for bug 23020. Relative URLs used in image.src and location.href should be resolved taking into account the base document URL of the calling context. R=pollmann

Browse Source
This commit is contained in:
vidur%netscape.com 2000-01-15 02:02:27 +00:00
parent da49ef2262
commit e296114aae
3 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
content/html/content/src/nsHTMLImageElement.cpp
View File

@ -526,15 +526,23 @@ nsHTMLImageElement::GetCallerSourceURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> global;
nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global));
if (global) {
nsCOMPtr<nsIWebShell> webShell;
global->GetWebShell(getter_AddRefs(webShell));
if (webShell) {
const PRUnichar* url;
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(global);
// XXX Ughh - incorrect ownership rules for url?
webShell->GetURL(&url);
result = NS_NewURI(sourceURL, url);
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(*sourceURL);
}
if (!*sourceURL) {
*sourceURL = doc->GetDocumentURL();
}
}
}
}

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

@ -34,6 +34,9 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
#include "nsCOMPtr.h"
#include "nsJSUtils.h"
#include "nsIScriptSecurityManager.h"
#include "nsIDOMWindow.h"
#include "nsIDOMDocument.h"
#include "nsIDocument.h"
#include "nsIJSContextStack.h"
static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
@ -702,15 +705,23 @@ LocationImpl::GetSourceURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> nativeGlob;
nsJSUtils::nsGetDynamicScriptGlobal(cx, getter_AddRefs(nativeGlob));
if (nativeGlob) {
nsCOMPtr<nsIWebShell> webShell;
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(nativeGlob);
nativeGlob->GetWebShell(getter_AddRefs(webShell));
if (webShell) {
const PRUnichar* url;
if (window) {
nsCOMPtr<nsIDOMDocument> domDoc;
// XXX Ughh - incorrect ownership rules for url?
webShell->GetURL(&url);
result = NS_NewURI(sourceURL, url);
result = window->GetDocument(getter_AddRefs(domDoc));
if (NS_SUCCEEDED(result)) {
nsCOMPtr<nsIDocument> doc = do_QueryInterface(domDoc);
if (doc) {
result = doc->GetBaseURL(*sourceURL);
}
if (!*sourceURL) {
*sourceURL = doc->GetDocumentURL();
}
}
}
}

24
layout/html/content/src/nsHTMLImageElement.cpp
View File

@ -526,15 +526,23 @@ nsHTMLImageElement::GetCallerSourceURL(JSContext* cx,
nsCOMPtr<nsIScriptGlobalObject> global;
nsLayoutUtils::GetDynamicScriptGlobal(cx, getter_AddRefs(global));
if (global) {
nsCOMPtr<nsIWebShell> webShell;
global->GetWebShell(getter_AddRefs(webShell));
if (webShell) {
const PRUnichar* url;
nsCOMPtr<nsIDOMWindow> window = do_QueryInterface(global);
// XXX Ughh - incorrect ownership rules for url?
webShell->GetURL(&url);
result = NS_NewURI(sourceURL, url);
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(*sourceURL);
}
if (!*sourceURL) {
*sourceURL = doc->GetDocumentURL();
}
}
}
}