Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-15 04:39:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Better fix for SetOriginalURI nsCOMPtr problem.

Browse Source
This commit is contained in:
warren%netscape.com 2000-03-29 06:43:04 +00:00
parent e8f86ff0c8
commit 9a009d0b48
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docshell/base/nsWebShell.cpp
View File

@ -1201,7 +1201,7 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
rv = NS_OpenURI(getter_AddRefs(pChannel), aUri, pNetService, loadGroup, requestor, aType);
if (NS_SUCCEEDED(rv)) {
// XXX wrong, but needed for now:
rv = pChannel->SetOriginalURI(referrer ? referrer : nsCOMPtr<nsIURI>(aUri));
rv = pChannel->SetOriginalURI(referrer ? referrer.get() : aUri);
}
if (NS_FAILED(rv)) {
if (rv == NS_ERROR_DOM_RETVAL_UNDEFINED) // if causing the channel changed the

2
webshell/src/nsWebShell.cpp
View File

@ -1201,7 +1201,7 @@ nsWebShell::DoLoadURL(nsIURI * aUri,
rv = NS_OpenURI(getter_AddRefs(pChannel), aUri, pNetService, loadGroup, requestor, aType);
if (NS_SUCCEEDED(rv)) {
// XXX wrong, but needed for now:
rv = pChannel->SetOriginalURI(referrer ? referrer : nsCOMPtr<nsIURI>(aUri));
rv = pChannel->SetOriginalURI(referrer ? referrer.get() : aUri);
}
if (NS_FAILED(rv)) {
if (rv == NS_ERROR_DOM_RETVAL_UNDEFINED) // if causing the channel changed the