mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-01-22 03:43:58 +00:00
working on bug 37616, Retire SetRelativePath, removing last usage of SetRelativePath, r=warren@netscape.com, a=buster@netscape.com
This commit is contained in:
parent
4b6d90b76b
commit
657c5c9ac1
@ -34,6 +34,7 @@
|
||||
#include "nsIURL.h"
|
||||
#include "nsIIOService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsXPIDLString.h"
|
||||
|
||||
//static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
|
||||
static NS_DEFINE_IID(kIXMLContentIID, NS_IXMLCONTENT_IID);
|
||||
@ -156,7 +157,10 @@ nsXMLElement::GetXMLBaseURI(nsIURI **aURI)
|
||||
|
||||
if (!base.IsEmpty()) {
|
||||
str.AssignWithConversion(base.GetUnicode());
|
||||
rv = (*aURI)->SetRelativePath(str);
|
||||
nsXPIDLCString resolvedStr;
|
||||
rv = (*aURI)->Resolve(str, getter_Copies(resolvedStr));
|
||||
if (NS_FAILED(rv)) break;
|
||||
rv = (*aURI)->SetSpec(resolvedStr);
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -34,6 +34,7 @@
|
||||
#include "nsIURL.h"
|
||||
#include "nsIIOService.h"
|
||||
#include "nsIServiceManager.h"
|
||||
#include "nsXPIDLString.h"
|
||||
|
||||
//static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
|
||||
static NS_DEFINE_IID(kIXMLContentIID, NS_IXMLCONTENT_IID);
|
||||
@ -156,7 +157,10 @@ nsXMLElement::GetXMLBaseURI(nsIURI **aURI)
|
||||
|
||||
if (!base.IsEmpty()) {
|
||||
str.AssignWithConversion(base.GetUnicode());
|
||||
rv = (*aURI)->SetRelativePath(str);
|
||||
nsXPIDLCString resolvedStr;
|
||||
rv = (*aURI)->Resolve(str, getter_Copies(resolvedStr));
|
||||
if (NS_FAILED(rv)) break;
|
||||
rv = (*aURI)->SetSpec(resolvedStr);
|
||||
}
|
||||
break;
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user