mozilla
/
mozilla-history
зеркало из https://github.com/mozilla/mozilla-history.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Renamed nsIURLGroup to nsILoadGroup in preparation for necko.

This commit is contained in:
warren%netscape.com 1999-06-25 02:17:37 +00:00
Родитель 6fc20cbcd6
Коммит 2f5289766d
42 изменённых файлов: 231 добавлений и 231 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
content/base/public/nsIDocument.h
Просмотреть файл

@ -40,7 +40,7 @@ class nsIURI;
#ifdef NECKO #ifdef NECKO
class nsILoadGroup; class nsILoadGroup;
#else #else
class nsIURLGroup; class nsILoadGroup;
#endif #endif
class nsIViewManager; class nsIViewManager;
class nsString; class nsString;
@ -106,14 +106,14 @@ public:
#ifdef NECKO #ifdef NECKO
/** /**
* Return the URLGroup for the document. May return null. * Return the LoadGroup for the document. May return null.
*/ */
NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const = 0; NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const = 0;
#else #else
/** /**
* Return the URLGroup for the document. May return null. * Return the LoadGroup for the document. May return null.
*/ */
virtual nsIURLGroup* GetDocumentLoadGroup() const = 0; virtual nsILoadGroup* GetDocumentLoadGroup() const = 0;
#endif #endif
/** /**

4
content/base/src/nsDocument.cpp
Просмотреть файл

@ -891,7 +891,7 @@ nsDocument::Reset(nsIURI *aURL)
NS_ADDREF(aURL); NS_ADDREF(aURL);
#ifndef NECKO #ifndef NECKO
rv = aURL->GetURLGroup(&mDocumentLoadGroup); rv = aURL->GetLoadGroup(&mDocumentLoadGroup);
#endif #endif
} }
@ -932,7 +932,7 @@ nsDocument::GetContentType(nsString& aContentType) const
#ifdef NECKO #ifdef NECKO
NS_IMETHODIMP_(nsILoadGroup*) nsDocument::GetDocumentLoadGroup() const NS_IMETHODIMP_(nsILoadGroup*) nsDocument::GetDocumentLoadGroup() const
#else #else
nsIURLGroup* nsDocument::GetDocumentLoadGroup() const nsILoadGroup* nsDocument::GetDocumentLoadGroup() const
#endif #endif
{ {
NS_IF_ADDREF(mDocumentLoadGroup); NS_IF_ADDREF(mDocumentLoadGroup);

6
content/base/src/nsDocument.h
Просмотреть файл

@ -137,9 +137,9 @@ public:
NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const; NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const;
#else #else
/** /**
* Return the URLGroup for the document. May return null. * Return the LoadGroup for the document. May return null.
*/ */
virtual nsIURLGroup* GetDocumentLoadGroup() const; virtual nsILoadGroup* GetDocumentLoadGroup() const;
#endif #endif
/** /**
@ -452,7 +452,7 @@ protected:
#ifdef NECKO #ifdef NECKO
nsILoadGroup* mDocumentLoadGroup; nsILoadGroup* mDocumentLoadGroup;
#else #else
nsIURLGroup* mDocumentLoadGroup; nsILoadGroup* mDocumentLoadGroup;
#endif #endif
nsString mCharacterSet; nsString mCharacterSet;
nsIDocument* mParentDocument; nsIDocument* mParentDocument;

10
content/html/content/src/nsGenericHTMLElement.cpp
Просмотреть файл

@ -995,11 +995,11 @@ nsGenericHTMLElement::GetBaseURL(nsIHTMLAttributes* aAttributes,
nsIURI* url = nsnull; nsIURI* url = nsnull;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
docBaseURL->GetURLGroup(&urlGroup); docBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
result = urlGroup->CreateURL(&url, docBaseURL, baseHref, nsnull); result = LoadGroup->CreateURL(&url, docBaseURL, baseHref, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif

30
content/html/document/src/nsHTMLContentSink.cpp
Просмотреть файл

@ -2490,11 +2490,11 @@ HTMLContentSink::ProcessStyleLink(nsIHTMLContent* aElement,
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) {
nsIURI* url = nsnull; nsIURI* url = nsnull;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mDocumentBaseURL->GetURLGroup(&urlGroup); mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
result = urlGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); result = LoadGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif
@ -2933,11 +2933,11 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
// Use the SRC attribute value to load the URL // Use the SRC attribute value to load the URL
nsIURI* url = nsnull; nsIURI* url = nsnull;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mDocumentBaseURL->GetURLGroup(&urlGroup); mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif
@ -3094,11 +3094,11 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
// Use the SRC attribute value to load the URL // Use the SRC attribute value to load the URL
nsIURI* url = nsnull; nsIURI* url = nsnull;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mDocumentBaseURL->GetURLGroup(&urlGroup); mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif

10
content/html/document/src/nsHTMLDocument.cpp
Просмотреть файл

@ -573,11 +573,11 @@ nsHTMLDocument:: SetBaseURL(const nsString& aURLSpec)
NS_IF_RELEASE(mBaseURL); NS_IF_RELEASE(mBaseURL);
if (0 < aURLSpec.Length()) { if (0 < aURLSpec.Length()) {
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
(void)mDocumentURL->GetURLGroup(&urlGroup); (void)mDocumentURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
result = urlGroup->CreateURL(&mBaseURL, mDocumentURL, aURLSpec, nsnull); result = LoadGroup->CreateURL(&mBaseURL, mDocumentURL, aURLSpec, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif

10
content/html/style/src/nsCSSLoader.cpp
Просмотреть файл

@ -997,11 +997,11 @@ static nsIURI* CloneURL(nsIURI* aURL)
if (urlStr) { if (urlStr) {
nsAutoString buffer(urlStr); nsAutoString buffer(urlStr);
delete [] urlStr; delete [] urlStr;
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
aURL->GetURLGroup(&urlGroup); aURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
urlGroup->CreateURL(&result, aURL, buffer, nsnull); LoadGroup->CreateURL(&result, aURL, buffer, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO

10
content/html/style/src/nsCSSParser.cpp
Просмотреть файл

@ -826,11 +826,11 @@ PRBool CSSParserImpl::ProcessImport(PRInt32& aErrorCode, const nsString& aURLSpe
// XXX probably need a way to encode unicode junk for the part of // XXX probably need a way to encode unicode junk for the part of
// the url that follows a "?" // the url that follows a "?"
nsIURI* url; nsIURI* url;
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mURL->GetURLGroup(&urlGroup); mURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
aErrorCode = urlGroup->CreateURL(&url, mURL, aURLSpec, nsnull); aErrorCode = LoadGroup->CreateURL(&url, mURL, aURLSpec, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO

30
content/xml/document/src/nsXMLContentSink.cpp
Просмотреть файл

@ -1003,14 +1003,14 @@ nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
{ {
nsAutoString absURL; nsAutoString absURL;
nsIURI* docURL = mDocument->GetDocumentURL(); nsIURI* docURL = mDocument->GetDocumentURL();
nsIURLGroup* urlGroup; nsILoadGroup* LoadGroup;
nsresult result = NS_OK; nsresult result = NS_OK;
result = docURL->GetURLGroup(&urlGroup); result = docURL->GetLoadGroup(&LoadGroup);
if ((NS_SUCCEEDED(result)) && urlGroup) { if ((NS_SUCCEEDED(result)) && LoadGroup) {
result = urlGroup->CreateURL(aUrl, docURL, aHref, nsnull); result = LoadGroup->CreateURL(aUrl, docURL, aHref, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO
@ -1142,11 +1142,11 @@ nsXMLContentSink::ProcessStyleLink(nsIContent* aElement,
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) {
nsIURI* url = nsnull; nsIURI* url = nsnull;
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mDocumentBaseURL->GetURLGroup(&urlGroup); mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
result = urlGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); result = LoadGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO
@ -1764,13 +1764,13 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
nsIURI* url = nsnull; nsIURI* url = nsnull;
nsAutoString absURL; nsAutoString absURL;
nsIURI* docURL = mDocument->GetDocumentURL(); nsIURI* docURL = mDocument->GetDocumentURL();
nsIURLGroup* urlGroup; nsILoadGroup* LoadGroup;
rv = docURL->GetURLGroup(&urlGroup); rv = docURL->GetLoadGroup(&LoadGroup);
if ((NS_OK == rv) && urlGroup) { if ((NS_OK == rv) && LoadGroup) {
rv = urlGroup->CreateURL(&url, docURL, src, nsnull); rv = LoadGroup->CreateURL(&url, docURL, src, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO

4
content/xul/document/src/nsXULDocument.cpp
Просмотреть файл

@ -432,7 +432,7 @@ public:
virtual nsIURI* GetDocumentURL() const; virtual nsIURI* GetDocumentURL() const;
virtual nsIURLGroup* GetDocumentURLGroup() const; virtual nsIURLGroup* GetDocumentLoadGroup() const;
NS_IMETHOD GetBaseURL(nsIURI*& aURL) const; NS_IMETHOD GetBaseURL(nsIURI*& aURL) const;
@ -1359,7 +1359,7 @@ XULDocumentImpl::GetDocumentURL() const
} }
nsIURLGroup* nsIURLGroup*
XULDocumentImpl::GetDocumentURLGroup() const XULDocumentImpl::GetDocumentLoadGroup() const
{ {
nsIURLGroup* result = mDocumentURLGroup; nsIURLGroup* result = mDocumentURLGroup;
NS_IF_ADDREF(result); NS_IF_ADDREF(result);

4
gfx/public/nsIImageGroup.h
Просмотреть файл

@ -30,7 +30,7 @@ class nsIImageRequest;
class nsIDeviceContext; class nsIDeviceContext;
class nsIStreamListener; class nsIStreamListener;
#ifndef NECKO #ifndef NECKO
class nsIURLGroup; class nsILoadGroup;
#endif #endif
/** For important images, like backdrops. */ /** For important images, like backdrops. */
@ -64,7 +64,7 @@ public:
#ifdef NECKO #ifdef NECKO
virtual nsresult Init(nsIDeviceContext *aDeviceContext) = 0; virtual nsresult Init(nsIDeviceContext *aDeviceContext) = 0;
#else #else
virtual nsresult Init(nsIDeviceContext *aDeviceContext, nsIURLGroup* aURLGroup) = 0; virtual nsresult Init(nsIDeviceContext *aDeviceContext, nsILoadGroup* aLoadGroup) = 0;
#endif #endif
/** /**

14
gfx/src/nsImageGroup.cpp
Просмотреть файл

@ -45,7 +45,7 @@ public:
#ifdef NECKO #ifdef NECKO
nsresult Init(nsIDeviceContext *aDeviceContext); nsresult Init(nsIDeviceContext *aDeviceContext);
#else #else
nsresult Init(nsIDeviceContext *aDeviceContext, nsIURLGroup* aURLGroup); nsresult Init(nsIDeviceContext *aDeviceContext, nsILoadGroup* aLoadGroup);
#endif #endif
NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW
@ -81,7 +81,7 @@ public:
ilINetContext* mNetContext; ilINetContext* mNetContext;
nsIStreamListener** mListenerRequest; nsIStreamListener** mListenerRequest;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* mURLGroup; nsILoadGroup* mLoadGroup;
#endif #endif
}; };
@ -116,7 +116,7 @@ ImageGroupImpl::~ImageGroupImpl()
NS_IF_RELEASE(mManager); NS_IF_RELEASE(mManager);
NS_IF_RELEASE(mNetContext); NS_IF_RELEASE(mNetContext);
#ifndef NECKO #ifndef NECKO
NS_IF_RELEASE(mURLGroup); NS_IF_RELEASE(mLoadGroup);
#endif #endif
} }
@ -175,7 +175,7 @@ nsresult
#ifdef NECKO #ifdef NECKO
ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext) ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext)
#else #else
ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext, nsIURLGroup* aURLGroup) ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext, nsILoadGroup* aLoadGroup)
#endif #endif
{ {
ilIImageRenderer *renderer; ilIImageRenderer *renderer;
@ -192,15 +192,15 @@ ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext, nsIURLGroup* aURLGroup)
} }
#ifndef NECKO #ifndef NECKO
mURLGroup = aURLGroup; mLoadGroup = aLoadGroup;
NS_IF_ADDREF(mURLGroup); NS_IF_ADDREF(mLoadGroup);
#endif // NECKO #endif // NECKO
// Create an async net context // Create an async net context
#ifdef NECKO #ifdef NECKO
result = NS_NewImageNetContext(&mNetContext, ReconnectHack, this); result = NS_NewImageNetContext(&mNetContext, ReconnectHack, this);
#else #else
result = NS_NewImageNetContext(&mNetContext, mURLGroup, ReconnectHack, this); result = NS_NewImageNetContext(&mNetContext, mLoadGroup, ReconnectHack, this);
#endif #endif
if (NS_OK != result) { if (NS_OK != result) {
return result; return result;

6
gfx/src/nsImageNet.h
Просмотреть файл

@ -24,14 +24,14 @@
class nsIStreamListener; class nsIStreamListener;
#ifndef NECKO #ifndef NECKO
class nsIURLGroup; class nsILoadGroup;
#endif #endif
typedef PRBool (*nsReconnectCB)(void* arg, nsIStreamListener* aListener); typedef PRBool (*nsReconnectCB)(void* arg, nsIStreamListener* aListener);
extern "C" NS_GFX_(nsresult) extern "C" NS_GFX_(nsresult)
NS_NewImageNetContext(ilINetContext **aInstancePtrResult, NS_NewImageNetContext(ilINetContext **aInstancePtrResult,
#ifndef NECKO #ifndef NECKO
nsIURLGroup* aURLGroup, nsILoadGroup* aLoadGroup,
#endif #endif
nsReconnectCB aReconnectCallback, nsReconnectCB aReconnectCallback,
void* aReconnectArg); void* aReconnectArg);
@ -40,7 +40,7 @@ extern "C" NS_GFX_(nsresult)
NS_NewImageURL(ilIURL **aInstancePtrResult, NS_NewImageURL(ilIURL **aInstancePtrResult,
const char *aURL const char *aURL
#ifndef NECKO #ifndef NECKO
, nsIURLGroup* aURLGroup , nsILoadGroup* aLoadGroup
#endif #endif
); );

20
gfx/src/nsImageNetContextAsync.cpp
Просмотреть файл

@ -59,7 +59,7 @@ class ImageNetContextImpl : public ilINetContext {
public: public:
ImageNetContextImpl(NET_ReloadMethod aReloadPolicy, ImageNetContextImpl(NET_ReloadMethod aReloadPolicy,
#ifndef NECKO #ifndef NECKO
nsIURLGroup* aURLGroup, nsILoadGroup* aLoadGroup,
#endif #endif
nsReconnectCB aReconnectCallback, nsReconnectCB aReconnectCallback,
void* aReconnectArg); void* aReconnectArg);
@ -97,7 +97,7 @@ public:
nsVoidArray *mRequests; nsVoidArray *mRequests;
NET_ReloadMethod mReloadPolicy; NET_ReloadMethod mReloadPolicy;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* mURLGroup; nsILoadGroup* mLoadGroup;
#endif #endif
nsReconnectCB mReconnectCallback; nsReconnectCB mReconnectCallback;
void* mReconnectArg; void* mReconnectArg;
@ -400,7 +400,7 @@ ImageConsumer::~ImageConsumer()
ImageNetContextImpl::ImageNetContextImpl(NET_ReloadMethod aReloadPolicy, ImageNetContextImpl::ImageNetContextImpl(NET_ReloadMethod aReloadPolicy,
#ifndef NECKO #ifndef NECKO
nsIURLGroup* aURLGroup, nsILoadGroup* aLoadGroup,
#endif #endif
nsReconnectCB aReconnectCallback, nsReconnectCB aReconnectCallback,
void* aReconnectArg) void* aReconnectArg)
@ -408,8 +408,8 @@ ImageNetContextImpl::ImageNetContextImpl(NET_ReloadMethod aReloadPolicy,
NS_INIT_REFCNT(); NS_INIT_REFCNT();
mRequests = nsnull; mRequests = nsnull;
#ifndef NECKO #ifndef NECKO
mURLGroup = aURLGroup; mLoadGroup = aLoadGroup;
NS_IF_ADDREF(mURLGroup); NS_IF_ADDREF(mLoadGroup);
#endif #endif
mReloadPolicy = aReloadPolicy; mReloadPolicy = aReloadPolicy;
mReconnectCallback = aReconnectCallback; mReconnectCallback = aReconnectCallback;
@ -428,7 +428,7 @@ ImageNetContextImpl::~ImageNetContextImpl()
delete mRequests; delete mRequests;
} }
#ifndef NECKO #ifndef NECKO
NS_IF_RELEASE(mURLGroup); NS_IF_RELEASE(mLoadGroup);
#endif #endif
} }
@ -442,7 +442,7 @@ ImageNetContextImpl::Clone()
#ifdef NECKO #ifdef NECKO
if (NS_NewImageNetContext(&cx, mReconnectCallback, mReconnectArg) == NS_OK) if (NS_NewImageNetContext(&cx, mReconnectCallback, mReconnectArg) == NS_OK)
#else #else
if (NS_NewImageNetContext(&cx, mURLGroup, mReconnectCallback, mReconnectArg) == NS_OK) if (NS_NewImageNetContext(&cx, mLoadGroup, mReconnectCallback, mReconnectArg) == NS_OK)
#endif #endif
{ {
return cx; return cx;
@ -491,7 +491,7 @@ ImageNetContextImpl::CreateURL(const char *aURL,
#ifdef NECKO #ifdef NECKO
if (NS_NewImageURL(&url, aURL) == NS_OK) if (NS_NewImageURL(&url, aURL) == NS_OK)
#else #else
if (NS_NewImageURL(&url, aURL, mURLGroup) == NS_OK) if (NS_NewImageURL(&url, aURL, mLoadGroup) == NS_OK)
#endif #endif
{ {
return url; return url;
@ -598,7 +598,7 @@ ImageNetContextImpl::RequestDone(ImageConsumer *aConsumer)
extern "C" NS_GFX_(nsresult) extern "C" NS_GFX_(nsresult)
NS_NewImageNetContext(ilINetContext **aInstancePtrResult, NS_NewImageNetContext(ilINetContext **aInstancePtrResult,
#ifndef NECKO #ifndef NECKO
nsIURLGroup* aURLGroup, nsILoadGroup* aLoadGroup,
#endif #endif
nsReconnectCB aReconnectCallback, nsReconnectCB aReconnectCallback,
void* aReconnectArg) void* aReconnectArg)
@ -610,7 +610,7 @@ NS_NewImageNetContext(ilINetContext **aInstancePtrResult,
ilINetContext *cx = new ImageNetContextImpl(NET_NORMAL_RELOAD, ilINetContext *cx = new ImageNetContextImpl(NET_NORMAL_RELOAD,
#ifndef NECKO #ifndef NECKO
aURLGroup, aLoadGroup,
#endif #endif
aReconnectCallback, aReconnectCallback,
aReconnectArg); aReconnectArg);

12
gfx/src/nsImageURL.cpp
Просмотреть файл

@ -48,7 +48,7 @@ public:
#ifdef NECKO #ifdef NECKO
nsresult Init(const char *aURL); nsresult Init(const char *aURL);
#else #else
nsresult Init(const char *aURL, nsIURLGroup* aURLGroup); nsresult Init(const char *aURL, nsILoadGroup* aLoadGroup);
#endif #endif
virtual void SetReader(ilINetReader *aReader); virtual void SetReader(ilINetReader *aReader);
@ -90,13 +90,13 @@ nsresult
#ifdef NECKO #ifdef NECKO
ImageURLImpl::Init(const char *aURL) ImageURLImpl::Init(const char *aURL)
#else #else
ImageURLImpl::Init(const char *aURL, nsIURLGroup* aURLGroup) ImageURLImpl::Init(const char *aURL, nsILoadGroup* aLoadGroup)
#endif #endif
{ {
nsresult rv; nsresult rv;
#ifndef NECKO #ifndef NECKO
if (nsnull != aURLGroup) { if (nsnull != aLoadGroup) {
rv = aURLGroup->CreateURL(&mURL, nsnull, aURL, nsnull); rv = aLoadGroup->CreateURL(&mURL, nsnull, aURL, nsnull);
} }
else else
#endif #endif
@ -245,7 +245,7 @@ ImageURLImpl::SetOwnerId(int aOwnerId)
extern "C" NS_GFX_(nsresult) extern "C" NS_GFX_(nsresult)
NS_NewImageURL(ilIURL **aInstancePtrResult, const char *aURL NS_NewImageURL(ilIURL **aInstancePtrResult, const char *aURL
#ifndef NECKO #ifndef NECKO
, nsIURLGroup* aURLGroup , nsILoadGroup* aLoadGroup
#endif #endif
) )
{ {
@ -261,7 +261,7 @@ NS_NewImageURL(ilIURL **aInstancePtrResult, const char *aURL
#ifdef NECKO #ifdef NECKO
nsresult rv = url->Init(aURL); nsresult rv = url->Init(aURL);
#else #else
nsresult rv = url->Init(aURL, aURLGroup); nsresult rv = url->Init(aURL, aLoadGroup);
#endif #endif
if (rv != NS_OK) { if (rv != NS_OK) {
delete url; delete url;

6
layout/base/nsPresContext.cpp
Просмотреть файл

@ -703,10 +703,10 @@ nsPresContext::GetImageGroup(nsIImageGroup** aResult)
#ifndef NECKO #ifndef NECKO
// Initialize the image group // Initialize the image group
nsCOMPtr<nsIURLGroup> urlGroup; nsCOMPtr<nsILoadGroup> LoadGroup;
rv = mBaseURL->GetURLGroup(getter_AddRefs(urlGroup)); rv = mBaseURL->GetLoadGroup(getter_AddRefs(LoadGroup));
if (rv == NS_OK) if (rv == NS_OK)
rv = mImageGroup->Init(mDeviceContext, urlGroup); rv = mImageGroup->Init(mDeviceContext, LoadGroup);
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }

8
layout/base/public/nsIDocument.h
Просмотреть файл

@ -40,7 +40,7 @@ class nsIURI;
#ifdef NECKO #ifdef NECKO
class nsILoadGroup; class nsILoadGroup;
#else #else
class nsIURLGroup; class nsILoadGroup;
#endif #endif
class nsIViewManager; class nsIViewManager;
class nsString; class nsString;
@ -106,14 +106,14 @@ public:
#ifdef NECKO #ifdef NECKO
/** /**
* Return the URLGroup for the document. May return null. * Return the LoadGroup for the document. May return null.
*/ */
NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const = 0; NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const = 0;
#else #else
/** /**
* Return the URLGroup for the document. May return null. * Return the LoadGroup for the document. May return null.
*/ */
virtual nsIURLGroup* GetDocumentLoadGroup() const = 0; virtual nsILoadGroup* GetDocumentLoadGroup() const = 0;
#endif #endif
/** /**

4
layout/base/src/nsDocument.cpp
Просмотреть файл

@ -891,7 +891,7 @@ nsDocument::Reset(nsIURI *aURL)
NS_ADDREF(aURL); NS_ADDREF(aURL);
#ifndef NECKO #ifndef NECKO
rv = aURL->GetURLGroup(&mDocumentLoadGroup); rv = aURL->GetLoadGroup(&mDocumentLoadGroup);
#endif #endif
} }
@ -932,7 +932,7 @@ nsDocument::GetContentType(nsString& aContentType) const
#ifdef NECKO #ifdef NECKO
NS_IMETHODIMP_(nsILoadGroup*) nsDocument::GetDocumentLoadGroup() const NS_IMETHODIMP_(nsILoadGroup*) nsDocument::GetDocumentLoadGroup() const
#else #else
nsIURLGroup* nsDocument::GetDocumentLoadGroup() const nsILoadGroup* nsDocument::GetDocumentLoadGroup() const
#endif #endif
{ {
NS_IF_ADDREF(mDocumentLoadGroup); NS_IF_ADDREF(mDocumentLoadGroup);

6
layout/base/src/nsDocument.h
Просмотреть файл

@ -137,9 +137,9 @@ public:
NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const; NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const;
#else #else
/** /**
* Return the URLGroup for the document. May return null. * Return the LoadGroup for the document. May return null.
*/ */
virtual nsIURLGroup* GetDocumentLoadGroup() const; virtual nsILoadGroup* GetDocumentLoadGroup() const;
#endif #endif
/** /**
@ -452,7 +452,7 @@ protected:
#ifdef NECKO #ifdef NECKO
nsILoadGroup* mDocumentLoadGroup; nsILoadGroup* mDocumentLoadGroup;
#else #else
nsIURLGroup* mDocumentLoadGroup; nsILoadGroup* mDocumentLoadGroup;
#endif #endif
nsString mCharacterSet; nsString mCharacterSet;
nsIDocument* mParentDocument; nsIDocument* mParentDocument;

6
layout/base/src/nsPresContext.cpp
Просмотреть файл

@ -703,10 +703,10 @@ nsPresContext::GetImageGroup(nsIImageGroup** aResult)
#ifndef NECKO #ifndef NECKO
// Initialize the image group // Initialize the image group
nsCOMPtr<nsIURLGroup> urlGroup; nsCOMPtr<nsILoadGroup> LoadGroup;
rv = mBaseURL->GetURLGroup(getter_AddRefs(urlGroup)); rv = mBaseURL->GetLoadGroup(getter_AddRefs(LoadGroup));
if (rv == NS_OK) if (rv == NS_OK)
rv = mImageGroup->Init(mDeviceContext, urlGroup); rv = mImageGroup->Init(mDeviceContext, LoadGroup);
if (NS_OK != rv) { if (NS_OK != rv) {
return rv; return rv;
} }

20
layout/generic/nsObjectFrame.cpp
Просмотреть файл

@ -594,9 +594,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
return rv; return rv;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if (nsnull != baseURL) if (nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
#endif #endif
nsAutoString codeBase; nsAutoString codeBase;
@ -675,9 +675,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
return rv; return rv;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if(nsnull != baseURL) if(nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
#endif #endif
// if we have a codebase, add it to the fullURL // if we have a codebase, add it to the fullURL
@ -786,9 +786,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::code, src)) if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::code, src))
{ {
#ifndef NECKO #ifndef NECKO
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if (nsnull != baseURL) if (nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
#endif #endif
nsAutoString codeBase; nsAutoString codeBase;
@ -838,9 +838,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
// Create an absolute URL // Create an absolute URL
rv = NS_NewURI(&fullURL, src, baseURL); rv = NS_NewURI(&fullURL, src, baseURL);
#else #else
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if (nsnull != baseURL) if (nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
// Create an absolute URL // Create an absolute URL
rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group); rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group);
@ -853,9 +853,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
// Create an absolute URL // Create an absolute URL
rv = NS_NewURI(&fullURL, src, baseURL); rv = NS_NewURI(&fullURL, src, baseURL);
#else #else
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if (nsnull != baseURL) if (nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
// Create an absolute URL // Create an absolute URL
rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group); rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group);

20
layout/html/base/src/nsObjectFrame.cpp
Просмотреть файл

@ -594,9 +594,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
return rv; return rv;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if (nsnull != baseURL) if (nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
#endif #endif
nsAutoString codeBase; nsAutoString codeBase;
@ -675,9 +675,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
return rv; return rv;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if(nsnull != baseURL) if(nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
#endif #endif
// if we have a codebase, add it to the fullURL // if we have a codebase, add it to the fullURL
@ -786,9 +786,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::code, src)) if (NS_CONTENT_ATTR_HAS_VALUE == mContent->GetAttribute(kNameSpaceID_HTML, nsHTMLAtoms::code, src))
{ {
#ifndef NECKO #ifndef NECKO
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if (nsnull != baseURL) if (nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
#endif #endif
nsAutoString codeBase; nsAutoString codeBase;
@ -838,9 +838,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
// Create an absolute URL // Create an absolute URL
rv = NS_NewURI(&fullURL, src, baseURL); rv = NS_NewURI(&fullURL, src, baseURL);
#else #else
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if (nsnull != baseURL) if (nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
// Create an absolute URL // Create an absolute URL
rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group); rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group);
@ -853,9 +853,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext,
// Create an absolute URL // Create an absolute URL
rv = NS_NewURI(&fullURL, src, baseURL); rv = NS_NewURI(&fullURL, src, baseURL);
#else #else
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
if (nsnull != baseURL) if (nsnull != baseURL)
baseURL->GetURLGroup(&group); baseURL->GetLoadGroup(&group);
// Create an absolute URL // Create an absolute URL
rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group); rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group);

10
layout/html/content/src/nsGenericHTMLElement.cpp
Просмотреть файл

@ -995,11 +995,11 @@ nsGenericHTMLElement::GetBaseURL(nsIHTMLAttributes* aAttributes,
nsIURI* url = nsnull; nsIURI* url = nsnull;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
docBaseURL->GetURLGroup(&urlGroup); docBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
result = urlGroup->CreateURL(&url, docBaseURL, baseHref, nsnull); result = LoadGroup->CreateURL(&url, docBaseURL, baseHref, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif

30
layout/html/document/src/nsHTMLContentSink.cpp
Просмотреть файл

@ -2490,11 +2490,11 @@ HTMLContentSink::ProcessStyleLink(nsIHTMLContent* aElement,
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) {
nsIURI* url = nsnull; nsIURI* url = nsnull;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mDocumentBaseURL->GetURLGroup(&urlGroup); mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
result = urlGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); result = LoadGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif
@ -2933,11 +2933,11 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode)
// Use the SRC attribute value to load the URL // Use the SRC attribute value to load the URL
nsIURI* url = nsnull; nsIURI* url = nsnull;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mDocumentBaseURL->GetURLGroup(&urlGroup); mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif
@ -3094,11 +3094,11 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode)
// Use the SRC attribute value to load the URL // Use the SRC attribute value to load the URL
nsIURI* url = nsnull; nsIURI* url = nsnull;
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mDocumentBaseURL->GetURLGroup(&urlGroup); mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif

10
layout/html/document/src/nsHTMLDocument.cpp
Просмотреть файл

@ -573,11 +573,11 @@ nsHTMLDocument:: SetBaseURL(const nsString& aURLSpec)
NS_IF_RELEASE(mBaseURL); NS_IF_RELEASE(mBaseURL);
if (0 < aURLSpec.Length()) { if (0 < aURLSpec.Length()) {
#ifndef NECKO #ifndef NECKO
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
(void)mDocumentURL->GetURLGroup(&urlGroup); (void)mDocumentURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
result = urlGroup->CreateURL(&mBaseURL, mDocumentURL, aURLSpec, nsnull); result = LoadGroup->CreateURL(&mBaseURL, mDocumentURL, aURLSpec, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else else
#endif #endif

10
layout/html/style/src/nsCSSLoader.cpp
Просмотреть файл

@ -997,11 +997,11 @@ static nsIURI* CloneURL(nsIURI* aURL)
if (urlStr) { if (urlStr) {
nsAutoString buffer(urlStr); nsAutoString buffer(urlStr);
delete [] urlStr; delete [] urlStr;
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
aURL->GetURLGroup(&urlGroup); aURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
urlGroup->CreateURL(&result, aURL, buffer, nsnull); LoadGroup->CreateURL(&result, aURL, buffer, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO

10
layout/html/style/src/nsCSSParser.cpp
Просмотреть файл

@ -826,11 +826,11 @@ PRBool CSSParserImpl::ProcessImport(PRInt32& aErrorCode, const nsString& aURLSpe
// XXX probably need a way to encode unicode junk for the part of // XXX probably need a way to encode unicode junk for the part of
// the url that follows a "?" // the url that follows a "?"
nsIURI* url; nsIURI* url;
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mURL->GetURLGroup(&urlGroup); mURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
aErrorCode = urlGroup->CreateURL(&url, mURL, aURLSpec, nsnull); aErrorCode = LoadGroup->CreateURL(&url, mURL, aURLSpec, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO

10
layout/style/nsCSSLoader.cpp
Просмотреть файл

@ -997,11 +997,11 @@ static nsIURI* CloneURL(nsIURI* aURL)
if (urlStr) { if (urlStr) {
nsAutoString buffer(urlStr); nsAutoString buffer(urlStr);
delete [] urlStr; delete [] urlStr;
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
aURL->GetURLGroup(&urlGroup); aURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
urlGroup->CreateURL(&result, aURL, buffer, nsnull); LoadGroup->CreateURL(&result, aURL, buffer, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO

10
layout/style/nsCSSParser.cpp
Просмотреть файл

@ -826,11 +826,11 @@ PRBool CSSParserImpl::ProcessImport(PRInt32& aErrorCode, const nsString& aURLSpe
// XXX probably need a way to encode unicode junk for the part of // XXX probably need a way to encode unicode junk for the part of
// the url that follows a "?" // the url that follows a "?"
nsIURI* url; nsIURI* url;
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mURL->GetURLGroup(&urlGroup); mURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
aErrorCode = urlGroup->CreateURL(&url, mURL, aURLSpec, nsnull); aErrorCode = LoadGroup->CreateURL(&url, mURL, aURLSpec, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO

30
layout/xml/document/src/nsXMLContentSink.cpp
Просмотреть файл

@ -1003,14 +1003,14 @@ nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl,
{ {
nsAutoString absURL; nsAutoString absURL;
nsIURI* docURL = mDocument->GetDocumentURL(); nsIURI* docURL = mDocument->GetDocumentURL();
nsIURLGroup* urlGroup; nsILoadGroup* LoadGroup;
nsresult result = NS_OK; nsresult result = NS_OK;
result = docURL->GetURLGroup(&urlGroup); result = docURL->GetLoadGroup(&LoadGroup);
if ((NS_SUCCEEDED(result)) && urlGroup) { if ((NS_SUCCEEDED(result)) && LoadGroup) {
result = urlGroup->CreateURL(aUrl, docURL, aHref, nsnull); result = LoadGroup->CreateURL(aUrl, docURL, aHref, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO
@ -1142,11 +1142,11 @@ nsXMLContentSink::ProcessStyleLink(nsIContent* aElement,
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) {
nsIURI* url = nsnull; nsIURI* url = nsnull;
nsIURLGroup* urlGroup = nsnull; nsILoadGroup* LoadGroup = nsnull;
mDocumentBaseURL->GetURLGroup(&urlGroup); mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if (urlGroup) { if (LoadGroup) {
result = urlGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); result = LoadGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO
@ -1764,13 +1764,13 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode)
nsIURI* url = nsnull; nsIURI* url = nsnull;
nsAutoString absURL; nsAutoString absURL;
nsIURI* docURL = mDocument->GetDocumentURL(); nsIURI* docURL = mDocument->GetDocumentURL();
nsIURLGroup* urlGroup; nsILoadGroup* LoadGroup;
rv = docURL->GetURLGroup(&urlGroup); rv = docURL->GetLoadGroup(&LoadGroup);
if ((NS_OK == rv) && urlGroup) { if ((NS_OK == rv) && LoadGroup) {
rv = urlGroup->CreateURL(&url, docURL, src, nsnull); rv = LoadGroup->CreateURL(&url, docURL, src, nsnull);
NS_RELEASE(urlGroup); NS_RELEASE(LoadGroup);
} }
else { else {
#ifndef NECKO #ifndef NECKO

4
mailnews/base/util/nsMsgMailNewsUrl.cpp
Просмотреть файл

@ -420,12 +420,12 @@ nsresult nsMsgMailNewsUrl::SetLoadAttribs(nsILoadAttribs* aLoadAttribs)
return NS_OK; return NS_OK;
} }
nsresult nsMsgMailNewsUrl::GetURLGroup(nsIURLGroup* *result) const nsresult nsMsgMailNewsUrl::GetLoadGroup(nsILoadGroup* *result) const
{ {
return NS_OK; return NS_OK;
} }
nsresult nsMsgMailNewsUrl::SetURLGroup(nsIURLGroup* group) nsresult nsMsgMailNewsUrl::SetLoadGroup(nsILoadGroup* group)
{ {
NS_ASSERTION(m_URL_s == nsnull, "URL has already been opened"); NS_ASSERTION(m_URL_s == nsnull, "URL has already been opened");
return NS_OK; return NS_OK;

4
mailnews/base/util/nsMsgMailNewsUrl.h
Просмотреть файл

@ -95,8 +95,8 @@ public:
NS_IMETHOD SetContainer(nsISupports* container); NS_IMETHOD SetContainer(nsISupports* container);
NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const; // make obsolete NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const; // make obsolete
NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs); // make obsolete NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs); // make obsolete
NS_IMETHOD GetURLGroup(nsIURLGroup* *result) const; // make obsolete NS_IMETHOD GetLoadGroup(nsILoadGroup* *result) const; // make obsolete
NS_IMETHOD SetURLGroup(nsIURLGroup* group); // make obsolete NS_IMETHOD SetLoadGroup(nsILoadGroup* group); // make obsolete
NS_IMETHOD SetPostHeader(const char* name, const char* value); // make obsolete NS_IMETHOD SetPostHeader(const char* name, const char* value); // make obsolete
NS_IMETHOD SetPostData(nsIInputStream* input); // make obsolete NS_IMETHOD SetPostData(nsIInputStream* input); // make obsolete
NS_IMETHOD GetContentLength(PRInt32 *len); NS_IMETHOD GetContentLength(PRInt32 *len);

4
network/module/nsHttpURLFactory.cpp
Просмотреть файл

@ -36,7 +36,7 @@ public:
const nsString& aSpec, const nsString& aSpec,
const nsIURI* aContextURL = nsnull, const nsIURI* aContextURL = nsnull,
nsISupports* aContainer = nsnull, nsISupports* aContainer = nsnull,
nsIURLGroup* aGroup = nsnull); nsILoadGroup* aGroup = nsnull);
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
// nsHttpURLFactory: // nsHttpURLFactory:
@ -65,7 +65,7 @@ nsHttpURLFactory::CreateURL(nsIURI* *aResult,
const nsString& aSpec, const nsString& aSpec,
const nsIURI* aContextURL, const nsIURI* aContextURL,
nsISupports* aContainer, nsISupports* aContainer,
nsIURLGroup* aGroup) nsILoadGroup* aGroup)
{ {
nsHttpUrlImpl* url = new nsHttpUrlImpl(aContainer, aGroup); nsHttpUrlImpl* url = new nsHttpUrlImpl(aContainer, aGroup);
if (url == NULL) if (url == NULL)

22
network/module/nsHttpUrl.cpp
Просмотреть файл

@ -38,7 +38,7 @@ static NS_DEFINE_IID(kIURLIID, NS_IURL_IID);
static NS_DEFINE_IID(kIPostToServerIID, NS_IPOSTTOSERVER_IID); static NS_DEFINE_IID(kIPostToServerIID, NS_IPOSTTOSERVER_IID);
static NS_DEFINE_IID(kIProtocolConnectionIID, NS_IPROTOCOLCONNECTION_IID); static NS_DEFINE_IID(kIProtocolConnectionIID, NS_IPROTOCOLCONNECTION_IID);
nsHttpUrlImpl::nsHttpUrlImpl(nsISupports* aContainer, nsIURLGroup* aGroup) nsHttpUrlImpl::nsHttpUrlImpl(nsISupports* aContainer, nsILoadGroup* aGroup)
{ {
NS_INIT_REFCNT(); NS_INIT_REFCNT();
@ -55,11 +55,11 @@ nsHttpUrlImpl::nsHttpUrlImpl(nsISupports* aContainer, nsIURLGroup* aGroup)
mSpec = nsnull; mSpec = nsnull;
mSearch = nsnull; mSearch = nsnull;
mContainer = nsnull; mContainer = nsnull;
mURLGroup = aGroup; mLoadGroup = aGroup;
NS_NewLoadAttribs( getter_AddRefs(mLoadAttribs) ); NS_NewLoadAttribs( getter_AddRefs(mLoadAttribs) );
// NS_IF_ADDREF(mURLGroup); --- a url should not own its group, its group already owns it // NS_IF_ADDREF(mLoadGroup); --- a url should not own its group, its group already owns it
mContainer = aContainer; mContainer = aContainer;
// NS_IF_ADDREF(mContainer); --- a url should not own its container, its container already owns it // NS_IF_ADDREF(mContainer); --- a url should not own its container, its container already owns it
@ -69,7 +69,7 @@ nsHttpUrlImpl::nsHttpUrlImpl(nsISupports* aContainer, nsIURLGroup* aGroup)
nsHttpUrlImpl::~nsHttpUrlImpl() nsHttpUrlImpl::~nsHttpUrlImpl()
{ {
// NS_IF_RELEASE(mContainer); // NS_IF_RELEASE(mContainer);
// NS_IF_RELEASE(mURLGroup); // NS_IF_RELEASE(mLoadGroup);
PR_FREEIF(mSpec); PR_FREEIF(mSpec);
PR_FREEIF(mProtocol); PR_FREEIF(mProtocol);
@ -852,22 +852,22 @@ nsresult nsHttpUrlImpl::SetLoadAttribs(nsILoadAttribs* aLoadAttribs)
return NS_OK; return NS_OK;
} }
nsresult nsHttpUrlImpl::GetURLGroup(nsIURLGroup* *result) const nsresult nsHttpUrlImpl::GetLoadGroup(nsILoadGroup* *result) const
{ {
NS_LOCK_INSTANCE(); NS_LOCK_INSTANCE();
*result = mURLGroup; *result = mLoadGroup;
NS_IF_ADDREF(mURLGroup); // getters must |AddRef| their result, even if they didn'st already own it NS_IF_ADDREF(mLoadGroup); // getters must |AddRef| their result, even if they didn'st already own it
NS_UNLOCK_INSTANCE(); NS_UNLOCK_INSTANCE();
return NS_OK; return NS_OK;
} }
nsresult nsHttpUrlImpl::SetURLGroup(nsIURLGroup* group) nsresult nsHttpUrlImpl::SetLoadGroup(nsILoadGroup* group)
{ {
NS_ASSERTION(m_URL_s == nsnull, "URL has already been opened"); NS_ASSERTION(m_URL_s == nsnull, "URL has already been opened");
NS_LOCK_INSTANCE(); NS_LOCK_INSTANCE();
// NS_IF_RELEASE(mURLGroup); // NS_IF_RELEASE(mLoadGroup);
mURLGroup = group; mLoadGroup = group;
// NS_IF_ADDREF(mURLGroup); // NS_IF_ADDREF(mLoadGroup);
NS_UNLOCK_INSTANCE(); NS_UNLOCK_INSTANCE();
return NS_OK; return NS_OK;
} }

8
network/module/nsHttpUrl.h
Просмотреть файл

@ -51,8 +51,8 @@ public:
NS_IMETHOD SetContainer(nsISupports* container); NS_IMETHOD SetContainer(nsISupports* container);
NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const; NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const;
NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs); NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs);
NS_IMETHOD GetURLGroup(nsIURLGroup* *result) const; NS_IMETHOD GetLoadGroup(nsILoadGroup* *result) const;
NS_IMETHOD SetURLGroup(nsIURLGroup* group); NS_IMETHOD SetLoadGroup(nsILoadGroup* group);
NS_IMETHOD SetPostHeader(const char* name, const char* value); NS_IMETHOD SetPostHeader(const char* name, const char* value);
NS_IMETHOD SetPostData(nsIInputStream* input); NS_IMETHOD SetPostData(nsIInputStream* input);
NS_IMETHOD GetContentLength(PRInt32 *len); NS_IMETHOD GetContentLength(PRInt32 *len);
@ -73,7 +73,7 @@ public:
Send_DataFromFile Send_DataFromFile
} SendType; } SendType;
nsHttpUrlImpl(nsISupports* aContainer, nsIURLGroup* aGroup); nsHttpUrlImpl(nsISupports* aContainer, nsILoadGroup* aGroup);
NS_DECL_ISUPPORTS NS_DECL_ISUPPORTS
@ -113,7 +113,7 @@ protected:
nsCOMPtr<nsIInputStream> mPostData; nsCOMPtr<nsIInputStream> mPostData;
nsISupports* mContainer; // explicitly changed to no longer own its container nsISupports* mContainer; // explicitly changed to no longer own its container
nsCOMPtr<nsILoadAttribs> mLoadAttribs; nsCOMPtr<nsILoadAttribs> mLoadAttribs;
nsIURLGroup* mURLGroup; // explicitly changed to no longer own its group nsILoadGroup* mLoadGroup; // explicitly changed to no longer own its group
}; };
#endif // nsHttpUrl_h__ #endif // nsHttpUrl_h__

2
network/module/nsINetService.h
Просмотреть файл

@ -227,7 +227,7 @@ struct nsINetService : public nsISupports
const nsString& aSpec, const nsString& aSpec,
const nsIURI* aContextURL = nsnull, const nsIURI* aContextURL = nsnull,
nsISupports* aContainer = nsnull, nsISupports* aContainer = nsnull,
nsIURLGroup* aGroup = nsnull) = 0; nsILoadGroup* aGroup = nsnull) = 0;
/** /**
* Protocol connection pools should use this call into the service manager to * Protocol connection pools should use this call into the service manager to

4
network/module/nsIProtocolURLFactory.h
Просмотреть файл

@ -24,7 +24,7 @@
class nsString; class nsString;
class nsIURI; class nsIURI;
class nsIURLGroup; class nsILoadGroup;
#define NS_IPROTOCOLURLFACTORY_IID \ #define NS_IPROTOCOLURLFACTORY_IID \
{ /* aed57ad0-705e-11d2-8166-006008119d7a */ \ { /* aed57ad0-705e-11d2-8166-006008119d7a */ \
@ -51,7 +51,7 @@ public:
const nsString& aSpec, const nsString& aSpec,
const nsIURI* aContextURL = nsnull, const nsIURI* aContextURL = nsnull,
nsISupports* aContainer = nsnull, nsISupports* aContainer = nsnull,
nsIURLGroup* aGroup = nsnull) = 0; nsILoadGroup* aGroup = nsnull) = 0;
}; };
#endif /* nsIIProtocolURLFactory_h___ */ #endif /* nsIIProtocolURLFactory_h___ */

24
network/module/nsIURLGroup.h
Просмотреть файл

@ -29,15 +29,15 @@ class nsIStreamListener;
class nsILoadAttribs; class nsILoadAttribs;
/* {a4071430-5263-11d2-929b-00105a1b0d64} */ /* {a4071430-5263-11d2-929b-00105a1b0d64} */
#define NS_IURLGROUP_IID \ #define NS_ILOADGROUP_IID \
{ 0xa4071430, 0x5263, 0x11d2, \ { 0xa4071430, 0x5263, 0x11d2, \
{0x92, 0x9b, 0x00, 0x10, 0x5a, 0x1b, 0x0d, 0x64} } {0x92, 0x9b, 0x00, 0x10, 0x5a, 0x1b, 0x0d, 0x64} }
class nsIURLGroup : public nsISupports class nsILoadGroup : public nsISupports
{ {
public: public:
static const nsIID& GetIID() { static nsIID iid = NS_IURLGROUP_IID; return iid; } static const nsIID& GetIID() { static nsIID iid = NS_ILOADGROUP_IID; return iid; }
/** /**
* Create a new URL, setting its LoadAttributes to the default * Create a new URL, setting its LoadAttributes to the default
@ -71,7 +71,7 @@ public:
nsIStreamListener *aConsumer) = 0; nsIStreamListener *aConsumer) = 0;
/** /**
* Get the nsILoadAttributes for this nsIURLGroup and its children... * Get the nsILoadAttributes for this nsILoadGroup and its children...
* *
* @param aLoadAttribs Result parameter containing the nsILoadAttributes * @param aLoadAttribs Result parameter containing the nsILoadAttributes
* instance. * instance.
@ -81,34 +81,34 @@ public:
NS_IMETHOD GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs) = 0; NS_IMETHOD GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs) = 0;
/** /**
* Set the nsILoadAttributes for this nsIURLGroup and its children... * Set the nsILoadAttributes for this nsILoadGroup and its children...
* *
* @param aLoadAttribs nsILoadAttributes instance to be used by this * @param aLoadAttribs nsILoadAttributes instance to be used by this
* nsIURLGroup and its children. * nsILoadGroup and its children.
* *
* @return Returns NS_OK if successful, otherwise NS_ERROR_FAILURE. * @return Returns NS_OK if successful, otherwise NS_ERROR_FAILURE.
*/ */
NS_IMETHOD SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs) = 0; NS_IMETHOD SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs) = 0;
/** /**
* Add a child to an nsIURLGroup. * Add a child to an nsILoadGroup.
* *
* @param aGroup The nsIURLGroup to be added as a child. When the * @param aGroup The nsILoadGroup to be added as a child. When the
* child is added it will receive the nsILoadAttribs * child is added it will receive the nsILoadAttribs
* of its parent... * of its parent...
* *
* @return Returns NS_OK if successful, otherwise NS_ERROR_FAILURE. * @return Returns NS_OK if successful, otherwise NS_ERROR_FAILURE.
*/ */
NS_IMETHOD AddChildGroup(nsIURLGroup* aGroup) = 0; NS_IMETHOD AddChildGroup(nsILoadGroup* aGroup) = 0;
/** /**
* Remove a child from an nsIURLGroup. * Remove a child from an nsILoadGroup.
* *
* @param aGroup The nsIURLGroup to be removed. * @param aGroup The nsILoadGroup to be removed.
* *
* @return Returns NS_OK if successful, otherwise NS_ERROR_FAILURE. * @return Returns NS_OK if successful, otherwise NS_ERROR_FAILURE.
*/ */
NS_IMETHOD RemoveChildGroup(nsIURLGroup* aGroup) = 0; NS_IMETHOD RemoveChildGroup(nsILoadGroup* aGroup) = 0;
}; };
#endif /* nsIURLGroup_h__ */ #endif /* nsIURLGroup_h__ */

8
network/module/nsNetService.cpp
Просмотреть файл

@ -1044,7 +1044,7 @@ nsNetlibService::CreateURL(nsIURI* *aURL,
const nsString& aSpec, const nsString& aSpec,
const nsIURI* aContextURL, const nsIURI* aContextURL,
nsISupports* aContainer, nsISupports* aContainer,
nsIURLGroup* aGroup) nsILoadGroup* aGroup)
{ {
nsAutoString protoName; nsAutoString protoName;
PRInt32 pos = aSpec.Find(':'); PRInt32 pos = aSpec.Find(':');
@ -1117,7 +1117,7 @@ NS_NET nsresult NS_NewURL(nsIURI** aInstancePtrResult,
const nsString& aSpec, const nsString& aSpec,
const nsIURI* aURL, const nsIURI* aURL,
nsISupports* aContainer, nsISupports* aContainer,
nsIURLGroup* aGroup) nsILoadGroup* aGroup)
{ {
NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr"); NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr");
if (nsnull == aInstancePtrResult) { if (nsnull == aInstancePtrResult) {
@ -1172,9 +1172,9 @@ NS_NET nsresult NS_MakeAbsoluteURL(nsIURI* aURL,
NS_NET nsresult NS_OpenURL(nsIURI* aURL, nsIStreamListener* aConsumer) NS_NET nsresult NS_OpenURL(nsIURI* aURL, nsIStreamListener* aConsumer)
{ {
nsresult rv; nsresult rv;
nsIURLGroup* group = nsnull; nsILoadGroup* group = nsnull;
rv = aURL->GetURLGroup(&group); rv = aURL->GetLoadGroup(&group);
if (NS_SUCCEEDED(rv)) { if (NS_SUCCEEDED(rv)) {
if (nsnull != group) { if (nsnull != group) {
rv = group->OpenStream(aURL, aConsumer); rv = group->OpenStream(aURL, aConsumer);

2
network/module/nsNetService.h
Просмотреть файл

@ -82,7 +82,7 @@ public:
const nsString& aSpec, const nsString& aSpec,
const nsIURI* aContextURL = nsnull, const nsIURI* aContextURL = nsnull,
nsISupports* aContainer = nsnull, nsISupports* aContainer = nsnull,
nsIURLGroup* aGroup = nsnull); nsILoadGroup* aGroup = nsnull);
NS_IMETHOD AreThereActiveConnections(void); NS_IMETHOD AreThereActiveConnections(void);
NS_IMETHOD CreateSocketTransport(nsITransport **aTransport, PRUint32 aPortToUse, const char * aHostName); NS_IMETHOD CreateSocketTransport(nsITransport **aTransport, PRUint32 aPortToUse, const char * aHostName);

8
network/public/nsIURL.h
Просмотреть файл

@ -26,7 +26,7 @@
class nsIInputStream; class nsIInputStream;
class nsIStreamListener; class nsIStreamListener;
class nsString; class nsString;
class nsIURLGroup; class nsILoadGroup;
#define NS_IURL_IID \ #define NS_IURL_IID \
{ 0x6ecb2900, 0x93b5, 0x11d1, \ { 0x6ecb2900, 0x93b5, 0x11d1, \
@ -82,8 +82,8 @@ public:
NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const = 0; NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const = 0;
NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs) = 0; NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs) = 0;
NS_IMETHOD GetURLGroup(nsIURLGroup* *result) const = 0; NS_IMETHOD GetLoadGroup(nsILoadGroup* *result) const = 0;
NS_IMETHOD SetURLGroup(nsIURLGroup* group) = 0; NS_IMETHOD SetLoadGroup(nsILoadGroup* group) = 0;
//@} //@}
NS_IMETHOD SetPostHeader(const char* name, const char* value) = 0; NS_IMETHOD SetPostHeader(const char* name, const char* value) = 0;
@ -105,7 +105,7 @@ extern NS_NET nsresult NS_NewURL(nsIURI** aInstancePtrResult,
const nsString& aSpec, const nsString& aSpec,
const nsIURI* aBaseURL = nsnull, const nsIURI* aBaseURL = nsnull,
nsISupports* aContainer = nsnull, nsISupports* aContainer = nsnull,
nsIURLGroup* aGroup = nsnull); nsILoadGroup* aGroup = nsnull);
/** /**
* Utility routine to take a url (may be nsnull) and a base url (may * Utility routine to take a url (may be nsnull) and a base url (may

4
rdf/content/src/nsXULDocument.cpp
Просмотреть файл

@ -432,7 +432,7 @@ public:
virtual nsIURI* GetDocumentURL() const; virtual nsIURI* GetDocumentURL() const;
virtual nsIURLGroup* GetDocumentURLGroup() const; virtual nsIURLGroup* GetDocumentLoadGroup() const;
NS_IMETHOD GetBaseURL(nsIURI*& aURL) const; NS_IMETHOD GetBaseURL(nsIURI*& aURL) const;
@ -1359,7 +1359,7 @@ XULDocumentImpl::GetDocumentURL() const
} }
nsIURLGroup* nsIURLGroup*
XULDocumentImpl::GetDocumentURLGroup() const XULDocumentImpl::GetDocumentLoadGroup() const
{ {
nsIURLGroup* result = mDocumentURLGroup; nsIURLGroup* result = mDocumentURLGroup;
NS_IF_ADDREF(result); NS_IF_ADDREF(result);