mirror of
https://github.com/mozilla/gecko-dev.git
synced 2025-02-28 21:28:55 +00:00
Added outer param to NewLoadGroup.
This commit is contained in:
parent
e9f97d9c22
commit
8b0ad2bf4f
@ -54,6 +54,6 @@ extern nsresult
|
||||
NS_MakeAbsoluteURI(const nsString& spec, nsIURI* baseURI, nsString& result);
|
||||
|
||||
extern nsresult
|
||||
NS_NewLoadGroup(nsILoadGroup* parent, nsILoadGroup* *result);
|
||||
NS_NewLoadGroup(nsILoadGroup* parent, nsISupports* outer, nsILoadGroup* *result);
|
||||
|
||||
#endif // nsNeckoUtil_h__
|
||||
|
@ -55,11 +55,11 @@ NS_OpenURI(nsIChannel* *result, nsIURI* uri, nsILoadGroup* group)
|
||||
nsresult rv;
|
||||
NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
|
||||
nsIChannel* channel;
|
||||
rv = serv->NewChannelFromURI("load", uri, nsnull, &channel);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
#if 0
|
||||
if (group) {
|
||||
rv = group->AddChannel(channel);
|
||||
if (NS_FAILED(rv)) {
|
||||
@ -67,6 +67,7 @@ NS_OpenURI(nsIChannel* *result, nsIURI* uri, nsILoadGroup* group)
|
||||
return rv;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
*result = channel;
|
||||
return rv;
|
||||
}
|
||||
@ -131,13 +132,13 @@ NS_MakeAbsoluteURI(const nsString& spec, nsIURI* baseURI, nsString& result)
|
||||
}
|
||||
|
||||
nsresult
|
||||
NS_NewLoadGroup(nsILoadGroup* parent, nsILoadGroup* *result)
|
||||
NS_NewLoadGroup(nsILoadGroup* parent, nsISupports* outer, nsILoadGroup* *result)
|
||||
{
|
||||
nsresult rv;
|
||||
NS_WITH_SERVICE(nsIIOService, serv, kIOServiceCID, &rv);
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
|
||||
return serv->NewLoadGroup(parent, result);
|
||||
return serv->NewLoadGroup(parent, outer, result);
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -417,7 +417,7 @@ nsDocLoaderImpl::Init()
|
||||
rv = NS_NewISupportsArray(getter_AddRefs(m_LoadingDocsList));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
#ifdef NECKO
|
||||
rv = NS_NewLoadGroup(nsnull, getter_AddRefs(mLoadGroup));
|
||||
rv = NS_NewLoadGroup(nsnull, nsnull, getter_AddRefs(mLoadGroup));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
#else
|
||||
rv = NS_NewLoadAttribs(getter_AddRefs(m_LoadAttrib));
|
||||
|
@ -417,7 +417,7 @@ nsDocLoaderImpl::Init()
|
||||
rv = NS_NewISupportsArray(getter_AddRefs(m_LoadingDocsList));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
#ifdef NECKO
|
||||
rv = NS_NewLoadGroup(nsnull, getter_AddRefs(mLoadGroup));
|
||||
rv = NS_NewLoadGroup(nsnull, nsnull, getter_AddRefs(mLoadGroup));
|
||||
if (NS_FAILED(rv)) return rv;
|
||||
#else
|
||||
rv = NS_NewLoadAttribs(getter_AddRefs(m_LoadAttrib));
|
||||
|
Loading…
x
Reference in New Issue
Block a user