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

Fixing the remaining part (xpcdom regression) of bug 61984, r=harishd@netscape.com, sr=vidur@netscape.com

Browse Source
This commit is contained in:
jst%netscape.com 2001-05-15 20:58:31 +00:00
parent 55b0ea662e
commit 751a6f7ccd
2 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -318,13 +318,13 @@ public:
// nsIDOMNSLocation
NS_DECL_NSIDOMNSLOCATION
nsresult SetHrefWithContext(JSContext* cx, const nsAReadableString& aHref);
protected:
nsresult SetURL(nsIURI* aURL);
nsresult SetHrefWithBase(const nsAReadableString& aHref,
nsIURI* aBase,
nsresult SetHrefWithBase(const nsAReadableString& aHref, nsIURI* aBase,
PRBool aReplace);
nsresult SetHrefWithContext(JSContext* cx, const nsAReadableString& aHref,
PRBool aReplace);
nsresult GetSourceURL(JSContext* cx,
nsIURI** sourceURL);
nsresult CheckURL(nsIURI *url, nsIDocShellLoadInfo** aLoadInfo);

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

@ -366,7 +366,7 @@ LocationImpl::SetHref(const nsAReadableString& aHref)
return NS_ERROR_FAILURE;
if (cx) {
rv = SetHrefWithContext(cx, aHref);
rv = SetHrefWithContext(cx, aHref, PR_FALSE);
} else {
rv = GetHref(oldHref);
@ -385,8 +385,8 @@ LocationImpl::SetHref(const nsAReadableString& aHref)
}
nsresult
LocationImpl::SetHrefWithContext(JSContext* cx,
const nsAReadableString& aHref)
LocationImpl::SetHrefWithContext(JSContext* cx, const nsAReadableString& aHref,
PRBool aReplace)
{
nsCOMPtr<nsIURI> base;
@ -397,7 +397,7 @@ LocationImpl::SetHrefWithContext(JSContext* cx,
return result;
}
return SetHrefWithBase(aHref, base, PR_FALSE);
return SetHrefWithBase(aHref, base, aReplace);
}
nsresult
@ -728,24 +728,37 @@ LocationImpl::Reload()
NS_IMETHODIMP
LocationImpl::Replace(const nsAReadableString& aUrl)
{
nsAutoString oldHref;
nsresult result = NS_OK;
nsresult rv = NS_OK;
result = GetHref(oldHref);
// Get JSContext from stack.
nsCOMPtr<nsIJSContextStack>
stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1"));
// XXX: Get current context and base URL!!!
if (stack) {
JSContext *cx;
if (NS_SUCCEEDED(result)) {
nsCOMPtr<nsIURI> oldUri;
rv = stack->Peek(&cx);
NS_ENSURE_SUCCESS(rv, rv);
result = NS_NewURI(getter_AddRefs(oldUri), oldHref);
if (NS_FAILED(rv))
return rv;
if (oldUri) {
result = SetHrefWithBase(aUrl, oldUri, PR_TRUE);
if (cx) {
return SetHrefWithContext(cx, aUrl, PR_TRUE);
}
}
return result;
nsAutoString oldHref;
rv = GetHref(oldHref);
NS_ENSURE_SUCCESS(rv, rv);
nsCOMPtr<nsIURI> oldUri;
rv = NS_NewURI(getter_AddRefs(oldUri), oldHref);
NS_ENSURE_SUCCESS(rv, rv);
return SetHrefWithBase(aUrl, oldUri, PR_TRUE);
}
NS_IMETHODIMP