From 2f5289766d3572596dfe6768063ad8aafd0996a3 Mon Sep 17 00:00:00 2001 From: "warren%netscape.com" Date: Fri, 25 Jun 1999 02:17:37 +0000 Subject: [PATCH] Renamed nsIURLGroup to nsILoadGroup in preparation for necko. --- content/base/public/nsIDocument.h | 8 ++--- content/base/src/nsDocument.cpp | 4 +-- content/base/src/nsDocument.h | 6 ++-- .../html/content/src/nsGenericHTMLElement.cpp | 10 +++---- .../html/document/src/nsHTMLContentSink.cpp | 30 +++++++++---------- content/html/document/src/nsHTMLDocument.cpp | 10 +++---- content/html/style/src/nsCSSLoader.cpp | 10 +++---- content/html/style/src/nsCSSParser.cpp | 10 +++---- content/xml/document/src/nsXMLContentSink.cpp | 30 +++++++++---------- content/xul/document/src/nsXULDocument.cpp | 4 +-- gfx/public/nsIImageGroup.h | 4 +-- gfx/src/nsImageGroup.cpp | 14 ++++----- gfx/src/nsImageNet.h | 6 ++-- gfx/src/nsImageNetContextAsync.cpp | 20 ++++++------- gfx/src/nsImageURL.cpp | 12 ++++---- layout/base/nsPresContext.cpp | 6 ++-- layout/base/public/nsIDocument.h | 8 ++--- layout/base/src/nsDocument.cpp | 4 +-- layout/base/src/nsDocument.h | 6 ++-- layout/base/src/nsPresContext.cpp | 6 ++-- layout/generic/nsObjectFrame.cpp | 20 ++++++------- layout/html/base/src/nsObjectFrame.cpp | 20 ++++++------- .../html/content/src/nsGenericHTMLElement.cpp | 10 +++---- .../html/document/src/nsHTMLContentSink.cpp | 30 +++++++++---------- layout/html/document/src/nsHTMLDocument.cpp | 10 +++---- layout/html/style/src/nsCSSLoader.cpp | 10 +++---- layout/html/style/src/nsCSSParser.cpp | 10 +++---- layout/style/nsCSSLoader.cpp | 10 +++---- layout/style/nsCSSParser.cpp | 10 +++---- layout/xml/document/src/nsXMLContentSink.cpp | 30 +++++++++---------- mailnews/base/util/nsMsgMailNewsUrl.cpp | 4 +-- mailnews/base/util/nsMsgMailNewsUrl.h | 4 +-- network/module/nsHttpURLFactory.cpp | 4 +-- network/module/nsHttpUrl.cpp | 22 +++++++------- network/module/nsHttpUrl.h | 8 ++--- network/module/nsINetService.h | 2 +- network/module/nsIProtocolURLFactory.h | 4 +-- network/module/nsIURLGroup.h | 24 +++++++-------- network/module/nsNetService.cpp | 8 ++--- network/module/nsNetService.h | 2 +- network/public/nsIURL.h | 8 ++--- rdf/content/src/nsXULDocument.cpp | 4 +-- 42 files changed, 231 insertions(+), 231 deletions(-) diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h index ea70cc7587c..65e077bd3e0 100644 --- a/content/base/public/nsIDocument.h +++ b/content/base/public/nsIDocument.h @@ -40,7 +40,7 @@ class nsIURI; #ifdef NECKO class nsILoadGroup; #else -class nsIURLGroup; +class nsILoadGroup; #endif class nsIViewManager; class nsString; @@ -106,14 +106,14 @@ public: #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; #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 /** diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 673f9ca9c4b..e38505cedbb 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -891,7 +891,7 @@ nsDocument::Reset(nsIURI *aURL) NS_ADDREF(aURL); #ifndef NECKO - rv = aURL->GetURLGroup(&mDocumentLoadGroup); + rv = aURL->GetLoadGroup(&mDocumentLoadGroup); #endif } @@ -932,7 +932,7 @@ nsDocument::GetContentType(nsString& aContentType) const #ifdef NECKO NS_IMETHODIMP_(nsILoadGroup*) nsDocument::GetDocumentLoadGroup() const #else -nsIURLGroup* nsDocument::GetDocumentLoadGroup() const +nsILoadGroup* nsDocument::GetDocumentLoadGroup() const #endif { NS_IF_ADDREF(mDocumentLoadGroup); diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index a5e6b4ed035..df9a9047800 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -137,9 +137,9 @@ public: NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const; #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 /** @@ -452,7 +452,7 @@ protected: #ifdef NECKO nsILoadGroup* mDocumentLoadGroup; #else - nsIURLGroup* mDocumentLoadGroup; + nsILoadGroup* mDocumentLoadGroup; #endif nsString mCharacterSet; nsIDocument* mParentDocument; diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index e0f85e440b4..42073bb85ac 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -995,11 +995,11 @@ nsGenericHTMLElement::GetBaseURL(nsIHTMLAttributes* aAttributes, nsIURI* url = nsnull; #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - docBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - result = urlGroup->CreateURL(&url, docBaseURL, baseHref, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + docBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + result = LoadGroup->CreateURL(&url, docBaseURL, baseHref, nsnull); + NS_RELEASE(LoadGroup); } else #endif diff --git a/content/html/document/src/nsHTMLContentSink.cpp b/content/html/document/src/nsHTMLContentSink.cpp index 83e473cb25f..2437e443fb8 100644 --- a/content/html/document/src/nsHTMLContentSink.cpp +++ b/content/html/document/src/nsHTMLContentSink.cpp @@ -2490,11 +2490,11 @@ HTMLContentSink::ProcessStyleLink(nsIHTMLContent* aElement, if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { nsIURI* url = nsnull; #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - mDocumentBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - result = urlGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mDocumentBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + result = LoadGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); + NS_RELEASE(LoadGroup); } else #endif @@ -2933,11 +2933,11 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode) // Use the SRC attribute value to load the URL nsIURI* url = nsnull; #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - mDocumentBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mDocumentBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); + NS_RELEASE(LoadGroup); } else #endif @@ -3094,11 +3094,11 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode) // Use the SRC attribute value to load the URL nsIURI* url = nsnull; #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - mDocumentBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mDocumentBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); + NS_RELEASE(LoadGroup); } else #endif diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index e1c40451fdf..e498b545068 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -573,11 +573,11 @@ nsHTMLDocument:: SetBaseURL(const nsString& aURLSpec) NS_IF_RELEASE(mBaseURL); if (0 < aURLSpec.Length()) { #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - (void)mDocumentURL->GetURLGroup(&urlGroup); - if (urlGroup) { - result = urlGroup->CreateURL(&mBaseURL, mDocumentURL, aURLSpec, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + (void)mDocumentURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + result = LoadGroup->CreateURL(&mBaseURL, mDocumentURL, aURLSpec, nsnull); + NS_RELEASE(LoadGroup); } else #endif diff --git a/content/html/style/src/nsCSSLoader.cpp b/content/html/style/src/nsCSSLoader.cpp index c07a13b2787..fc052bbd28f 100644 --- a/content/html/style/src/nsCSSLoader.cpp +++ b/content/html/style/src/nsCSSLoader.cpp @@ -997,11 +997,11 @@ static nsIURI* CloneURL(nsIURI* aURL) if (urlStr) { nsAutoString buffer(urlStr); delete [] urlStr; - nsIURLGroup* urlGroup = nsnull; - aURL->GetURLGroup(&urlGroup); - if (urlGroup) { - urlGroup->CreateURL(&result, aURL, buffer, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + aURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + LoadGroup->CreateURL(&result, aURL, buffer, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO diff --git a/content/html/style/src/nsCSSParser.cpp b/content/html/style/src/nsCSSParser.cpp index d70e8fff554..24dea622693 100644 --- a/content/html/style/src/nsCSSParser.cpp +++ b/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 // the url that follows a "?" nsIURI* url; - nsIURLGroup* urlGroup = nsnull; - mURL->GetURLGroup(&urlGroup); - if (urlGroup) { - aErrorCode = urlGroup->CreateURL(&url, mURL, aURLSpec, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + aErrorCode = LoadGroup->CreateURL(&url, mURL, aURLSpec, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp index 81a40c7f832..42e349b06a3 100644 --- a/content/xml/document/src/nsXMLContentSink.cpp +++ b/content/xml/document/src/nsXMLContentSink.cpp @@ -1003,14 +1003,14 @@ nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl, { nsAutoString absURL; nsIURI* docURL = mDocument->GetDocumentURL(); - nsIURLGroup* urlGroup; + nsILoadGroup* LoadGroup; nsresult result = NS_OK; - result = docURL->GetURLGroup(&urlGroup); + result = docURL->GetLoadGroup(&LoadGroup); - if ((NS_SUCCEEDED(result)) && urlGroup) { - result = urlGroup->CreateURL(aUrl, docURL, aHref, nsnull); - NS_RELEASE(urlGroup); + if ((NS_SUCCEEDED(result)) && LoadGroup) { + result = LoadGroup->CreateURL(aUrl, docURL, aHref, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO @@ -1142,11 +1142,11 @@ nsXMLContentSink::ProcessStyleLink(nsIContent* aElement, if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { nsIURI* url = nsnull; - nsIURLGroup* urlGroup = nsnull; - mDocumentBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - result = urlGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mDocumentBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + result = LoadGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO @@ -1764,13 +1764,13 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode) nsIURI* url = nsnull; nsAutoString absURL; nsIURI* docURL = mDocument->GetDocumentURL(); - nsIURLGroup* urlGroup; + nsILoadGroup* LoadGroup; - rv = docURL->GetURLGroup(&urlGroup); + rv = docURL->GetLoadGroup(&LoadGroup); - if ((NS_OK == rv) && urlGroup) { - rv = urlGroup->CreateURL(&url, docURL, src, nsnull); - NS_RELEASE(urlGroup); + if ((NS_OK == rv) && LoadGroup) { + rv = LoadGroup->CreateURL(&url, docURL, src, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO diff --git a/content/xul/document/src/nsXULDocument.cpp b/content/xul/document/src/nsXULDocument.cpp index 40911336121..a05b88c59c8 100644 --- a/content/xul/document/src/nsXULDocument.cpp +++ b/content/xul/document/src/nsXULDocument.cpp @@ -432,7 +432,7 @@ public: virtual nsIURI* GetDocumentURL() const; - virtual nsIURLGroup* GetDocumentURLGroup() const; + virtual nsIURLGroup* GetDocumentLoadGroup() const; NS_IMETHOD GetBaseURL(nsIURI*& aURL) const; @@ -1359,7 +1359,7 @@ XULDocumentImpl::GetDocumentURL() const } nsIURLGroup* -XULDocumentImpl::GetDocumentURLGroup() const +XULDocumentImpl::GetDocumentLoadGroup() const { nsIURLGroup* result = mDocumentURLGroup; NS_IF_ADDREF(result); diff --git a/gfx/public/nsIImageGroup.h b/gfx/public/nsIImageGroup.h index 06c6961ca69..bc7060b7414 100644 --- a/gfx/public/nsIImageGroup.h +++ b/gfx/public/nsIImageGroup.h @@ -30,7 +30,7 @@ class nsIImageRequest; class nsIDeviceContext; class nsIStreamListener; #ifndef NECKO -class nsIURLGroup; +class nsILoadGroup; #endif /** For important images, like backdrops. */ @@ -64,7 +64,7 @@ public: #ifdef NECKO virtual nsresult Init(nsIDeviceContext *aDeviceContext) = 0; #else - virtual nsresult Init(nsIDeviceContext *aDeviceContext, nsIURLGroup* aURLGroup) = 0; + virtual nsresult Init(nsIDeviceContext *aDeviceContext, nsILoadGroup* aLoadGroup) = 0; #endif /** diff --git a/gfx/src/nsImageGroup.cpp b/gfx/src/nsImageGroup.cpp index df4bd0412d0..a36e402f248 100644 --- a/gfx/src/nsImageGroup.cpp +++ b/gfx/src/nsImageGroup.cpp @@ -45,7 +45,7 @@ public: #ifdef NECKO nsresult Init(nsIDeviceContext *aDeviceContext); #else - nsresult Init(nsIDeviceContext *aDeviceContext, nsIURLGroup* aURLGroup); + nsresult Init(nsIDeviceContext *aDeviceContext, nsILoadGroup* aLoadGroup); #endif NS_DECL_AND_IMPL_ZEROING_OPERATOR_NEW @@ -81,7 +81,7 @@ public: ilINetContext* mNetContext; nsIStreamListener** mListenerRequest; #ifndef NECKO - nsIURLGroup* mURLGroup; + nsILoadGroup* mLoadGroup; #endif }; @@ -116,7 +116,7 @@ ImageGroupImpl::~ImageGroupImpl() NS_IF_RELEASE(mManager); NS_IF_RELEASE(mNetContext); #ifndef NECKO - NS_IF_RELEASE(mURLGroup); + NS_IF_RELEASE(mLoadGroup); #endif } @@ -175,7 +175,7 @@ nsresult #ifdef NECKO ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext) #else -ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext, nsIURLGroup* aURLGroup) +ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext, nsILoadGroup* aLoadGroup) #endif { ilIImageRenderer *renderer; @@ -192,15 +192,15 @@ ImageGroupImpl::Init(nsIDeviceContext *aDeviceContext, nsIURLGroup* aURLGroup) } #ifndef NECKO - mURLGroup = aURLGroup; - NS_IF_ADDREF(mURLGroup); + mLoadGroup = aLoadGroup; + NS_IF_ADDREF(mLoadGroup); #endif // NECKO // Create an async net context #ifdef NECKO result = NS_NewImageNetContext(&mNetContext, ReconnectHack, this); #else - result = NS_NewImageNetContext(&mNetContext, mURLGroup, ReconnectHack, this); + result = NS_NewImageNetContext(&mNetContext, mLoadGroup, ReconnectHack, this); #endif if (NS_OK != result) { return result; diff --git a/gfx/src/nsImageNet.h b/gfx/src/nsImageNet.h index b84af46fbd7..631491288a8 100644 --- a/gfx/src/nsImageNet.h +++ b/gfx/src/nsImageNet.h @@ -24,14 +24,14 @@ class nsIStreamListener; #ifndef NECKO -class nsIURLGroup; +class nsILoadGroup; #endif typedef PRBool (*nsReconnectCB)(void* arg, nsIStreamListener* aListener); extern "C" NS_GFX_(nsresult) NS_NewImageNetContext(ilINetContext **aInstancePtrResult, #ifndef NECKO - nsIURLGroup* aURLGroup, + nsILoadGroup* aLoadGroup, #endif nsReconnectCB aReconnectCallback, void* aReconnectArg); @@ -40,7 +40,7 @@ extern "C" NS_GFX_(nsresult) NS_NewImageURL(ilIURL **aInstancePtrResult, const char *aURL #ifndef NECKO - , nsIURLGroup* aURLGroup + , nsILoadGroup* aLoadGroup #endif ); diff --git a/gfx/src/nsImageNetContextAsync.cpp b/gfx/src/nsImageNetContextAsync.cpp index 9a96577ceea..30844132186 100644 --- a/gfx/src/nsImageNetContextAsync.cpp +++ b/gfx/src/nsImageNetContextAsync.cpp @@ -59,7 +59,7 @@ class ImageNetContextImpl : public ilINetContext { public: ImageNetContextImpl(NET_ReloadMethod aReloadPolicy, #ifndef NECKO - nsIURLGroup* aURLGroup, + nsILoadGroup* aLoadGroup, #endif nsReconnectCB aReconnectCallback, void* aReconnectArg); @@ -97,7 +97,7 @@ public: nsVoidArray *mRequests; NET_ReloadMethod mReloadPolicy; #ifndef NECKO - nsIURLGroup* mURLGroup; + nsILoadGroup* mLoadGroup; #endif nsReconnectCB mReconnectCallback; void* mReconnectArg; @@ -400,7 +400,7 @@ ImageConsumer::~ImageConsumer() ImageNetContextImpl::ImageNetContextImpl(NET_ReloadMethod aReloadPolicy, #ifndef NECKO - nsIURLGroup* aURLGroup, + nsILoadGroup* aLoadGroup, #endif nsReconnectCB aReconnectCallback, void* aReconnectArg) @@ -408,8 +408,8 @@ ImageNetContextImpl::ImageNetContextImpl(NET_ReloadMethod aReloadPolicy, NS_INIT_REFCNT(); mRequests = nsnull; #ifndef NECKO - mURLGroup = aURLGroup; - NS_IF_ADDREF(mURLGroup); + mLoadGroup = aLoadGroup; + NS_IF_ADDREF(mLoadGroup); #endif mReloadPolicy = aReloadPolicy; mReconnectCallback = aReconnectCallback; @@ -428,7 +428,7 @@ ImageNetContextImpl::~ImageNetContextImpl() delete mRequests; } #ifndef NECKO - NS_IF_RELEASE(mURLGroup); + NS_IF_RELEASE(mLoadGroup); #endif } @@ -442,7 +442,7 @@ ImageNetContextImpl::Clone() #ifdef NECKO if (NS_NewImageNetContext(&cx, mReconnectCallback, mReconnectArg) == NS_OK) #else - if (NS_NewImageNetContext(&cx, mURLGroup, mReconnectCallback, mReconnectArg) == NS_OK) + if (NS_NewImageNetContext(&cx, mLoadGroup, mReconnectCallback, mReconnectArg) == NS_OK) #endif { return cx; @@ -491,7 +491,7 @@ ImageNetContextImpl::CreateURL(const char *aURL, #ifdef NECKO if (NS_NewImageURL(&url, aURL) == NS_OK) #else - if (NS_NewImageURL(&url, aURL, mURLGroup) == NS_OK) + if (NS_NewImageURL(&url, aURL, mLoadGroup) == NS_OK) #endif { return url; @@ -598,7 +598,7 @@ ImageNetContextImpl::RequestDone(ImageConsumer *aConsumer) extern "C" NS_GFX_(nsresult) NS_NewImageNetContext(ilINetContext **aInstancePtrResult, #ifndef NECKO - nsIURLGroup* aURLGroup, + nsILoadGroup* aLoadGroup, #endif nsReconnectCB aReconnectCallback, void* aReconnectArg) @@ -610,7 +610,7 @@ NS_NewImageNetContext(ilINetContext **aInstancePtrResult, ilINetContext *cx = new ImageNetContextImpl(NET_NORMAL_RELOAD, #ifndef NECKO - aURLGroup, + aLoadGroup, #endif aReconnectCallback, aReconnectArg); diff --git a/gfx/src/nsImageURL.cpp b/gfx/src/nsImageURL.cpp index fed9e43c78a..ad054b82e4e 100644 --- a/gfx/src/nsImageURL.cpp +++ b/gfx/src/nsImageURL.cpp @@ -48,7 +48,7 @@ public: #ifdef NECKO nsresult Init(const char *aURL); #else - nsresult Init(const char *aURL, nsIURLGroup* aURLGroup); + nsresult Init(const char *aURL, nsILoadGroup* aLoadGroup); #endif virtual void SetReader(ilINetReader *aReader); @@ -90,13 +90,13 @@ nsresult #ifdef NECKO ImageURLImpl::Init(const char *aURL) #else -ImageURLImpl::Init(const char *aURL, nsIURLGroup* aURLGroup) +ImageURLImpl::Init(const char *aURL, nsILoadGroup* aLoadGroup) #endif { nsresult rv; #ifndef NECKO - if (nsnull != aURLGroup) { - rv = aURLGroup->CreateURL(&mURL, nsnull, aURL, nsnull); + if (nsnull != aLoadGroup) { + rv = aLoadGroup->CreateURL(&mURL, nsnull, aURL, nsnull); } else #endif @@ -245,7 +245,7 @@ ImageURLImpl::SetOwnerId(int aOwnerId) extern "C" NS_GFX_(nsresult) NS_NewImageURL(ilIURL **aInstancePtrResult, const char *aURL #ifndef NECKO - , nsIURLGroup* aURLGroup + , nsILoadGroup* aLoadGroup #endif ) { @@ -261,7 +261,7 @@ NS_NewImageURL(ilIURL **aInstancePtrResult, const char *aURL #ifdef NECKO nsresult rv = url->Init(aURL); #else - nsresult rv = url->Init(aURL, aURLGroup); + nsresult rv = url->Init(aURL, aLoadGroup); #endif if (rv != NS_OK) { delete url; diff --git a/layout/base/nsPresContext.cpp b/layout/base/nsPresContext.cpp index 4267e7febec..921fd3bd74f 100644 --- a/layout/base/nsPresContext.cpp +++ b/layout/base/nsPresContext.cpp @@ -703,10 +703,10 @@ nsPresContext::GetImageGroup(nsIImageGroup** aResult) #ifndef NECKO // Initialize the image group - nsCOMPtr urlGroup; - rv = mBaseURL->GetURLGroup(getter_AddRefs(urlGroup)); + nsCOMPtr LoadGroup; + rv = mBaseURL->GetLoadGroup(getter_AddRefs(LoadGroup)); if (rv == NS_OK) - rv = mImageGroup->Init(mDeviceContext, urlGroup); + rv = mImageGroup->Init(mDeviceContext, LoadGroup); if (NS_OK != rv) { return rv; } diff --git a/layout/base/public/nsIDocument.h b/layout/base/public/nsIDocument.h index ea70cc7587c..65e077bd3e0 100644 --- a/layout/base/public/nsIDocument.h +++ b/layout/base/public/nsIDocument.h @@ -40,7 +40,7 @@ class nsIURI; #ifdef NECKO class nsILoadGroup; #else -class nsIURLGroup; +class nsILoadGroup; #endif class nsIViewManager; class nsString; @@ -106,14 +106,14 @@ public: #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; #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 /** diff --git a/layout/base/src/nsDocument.cpp b/layout/base/src/nsDocument.cpp index 673f9ca9c4b..e38505cedbb 100644 --- a/layout/base/src/nsDocument.cpp +++ b/layout/base/src/nsDocument.cpp @@ -891,7 +891,7 @@ nsDocument::Reset(nsIURI *aURL) NS_ADDREF(aURL); #ifndef NECKO - rv = aURL->GetURLGroup(&mDocumentLoadGroup); + rv = aURL->GetLoadGroup(&mDocumentLoadGroup); #endif } @@ -932,7 +932,7 @@ nsDocument::GetContentType(nsString& aContentType) const #ifdef NECKO NS_IMETHODIMP_(nsILoadGroup*) nsDocument::GetDocumentLoadGroup() const #else -nsIURLGroup* nsDocument::GetDocumentLoadGroup() const +nsILoadGroup* nsDocument::GetDocumentLoadGroup() const #endif { NS_IF_ADDREF(mDocumentLoadGroup); diff --git a/layout/base/src/nsDocument.h b/layout/base/src/nsDocument.h index a5e6b4ed035..df9a9047800 100644 --- a/layout/base/src/nsDocument.h +++ b/layout/base/src/nsDocument.h @@ -137,9 +137,9 @@ public: NS_IMETHOD_(nsILoadGroup*) GetDocumentLoadGroup() const; #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 /** @@ -452,7 +452,7 @@ protected: #ifdef NECKO nsILoadGroup* mDocumentLoadGroup; #else - nsIURLGroup* mDocumentLoadGroup; + nsILoadGroup* mDocumentLoadGroup; #endif nsString mCharacterSet; nsIDocument* mParentDocument; diff --git a/layout/base/src/nsPresContext.cpp b/layout/base/src/nsPresContext.cpp index 4267e7febec..921fd3bd74f 100644 --- a/layout/base/src/nsPresContext.cpp +++ b/layout/base/src/nsPresContext.cpp @@ -703,10 +703,10 @@ nsPresContext::GetImageGroup(nsIImageGroup** aResult) #ifndef NECKO // Initialize the image group - nsCOMPtr urlGroup; - rv = mBaseURL->GetURLGroup(getter_AddRefs(urlGroup)); + nsCOMPtr LoadGroup; + rv = mBaseURL->GetLoadGroup(getter_AddRefs(LoadGroup)); if (rv == NS_OK) - rv = mImageGroup->Init(mDeviceContext, urlGroup); + rv = mImageGroup->Init(mDeviceContext, LoadGroup); if (NS_OK != rv) { return rv; } diff --git a/layout/generic/nsObjectFrame.cpp b/layout/generic/nsObjectFrame.cpp index 890a859b01b..2f2544e85a9 100644 --- a/layout/generic/nsObjectFrame.cpp +++ b/layout/generic/nsObjectFrame.cpp @@ -594,9 +594,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, return rv; #ifndef NECKO - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if (nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); #endif nsAutoString codeBase; @@ -675,9 +675,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, return rv; #ifndef NECKO - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if(nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); #endif // 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)) { #ifndef NECKO - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if (nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); #endif nsAutoString codeBase; @@ -838,9 +838,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, // Create an absolute URL rv = NS_NewURI(&fullURL, src, baseURL); #else - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if (nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); // Create an absolute URL rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group); @@ -853,9 +853,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, // Create an absolute URL rv = NS_NewURI(&fullURL, src, baseURL); #else - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if (nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); // Create an absolute URL rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group); diff --git a/layout/html/base/src/nsObjectFrame.cpp b/layout/html/base/src/nsObjectFrame.cpp index 890a859b01b..2f2544e85a9 100644 --- a/layout/html/base/src/nsObjectFrame.cpp +++ b/layout/html/base/src/nsObjectFrame.cpp @@ -594,9 +594,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, return rv; #ifndef NECKO - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if (nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); #endif nsAutoString codeBase; @@ -675,9 +675,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, return rv; #ifndef NECKO - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if(nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); #endif // 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)) { #ifndef NECKO - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if (nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); #endif nsAutoString codeBase; @@ -838,9 +838,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, // Create an absolute URL rv = NS_NewURI(&fullURL, src, baseURL); #else - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if (nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); // Create an absolute URL rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group); @@ -853,9 +853,9 @@ nsObjectFrame::Reflow(nsIPresContext& aPresContext, // Create an absolute URL rv = NS_NewURI(&fullURL, src, baseURL); #else - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; if (nsnull != baseURL) - baseURL->GetURLGroup(&group); + baseURL->GetLoadGroup(&group); // Create an absolute URL rv = NS_NewURL(&fullURL, src, baseURL, nsnull, group); diff --git a/layout/html/content/src/nsGenericHTMLElement.cpp b/layout/html/content/src/nsGenericHTMLElement.cpp index e0f85e440b4..42073bb85ac 100644 --- a/layout/html/content/src/nsGenericHTMLElement.cpp +++ b/layout/html/content/src/nsGenericHTMLElement.cpp @@ -995,11 +995,11 @@ nsGenericHTMLElement::GetBaseURL(nsIHTMLAttributes* aAttributes, nsIURI* url = nsnull; #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - docBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - result = urlGroup->CreateURL(&url, docBaseURL, baseHref, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + docBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + result = LoadGroup->CreateURL(&url, docBaseURL, baseHref, nsnull); + NS_RELEASE(LoadGroup); } else #endif diff --git a/layout/html/document/src/nsHTMLContentSink.cpp b/layout/html/document/src/nsHTMLContentSink.cpp index 83e473cb25f..2437e443fb8 100644 --- a/layout/html/document/src/nsHTMLContentSink.cpp +++ b/layout/html/document/src/nsHTMLContentSink.cpp @@ -2490,11 +2490,11 @@ HTMLContentSink::ProcessStyleLink(nsIHTMLContent* aElement, if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { nsIURI* url = nsnull; #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - mDocumentBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - result = urlGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mDocumentBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + result = LoadGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); + NS_RELEASE(LoadGroup); } else #endif @@ -2933,11 +2933,11 @@ HTMLContentSink::ProcessSCRIPTTag(const nsIParserNode& aNode) // Use the SRC attribute value to load the URL nsIURI* url = nsnull; #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - mDocumentBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mDocumentBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); + NS_RELEASE(LoadGroup); } else #endif @@ -3094,11 +3094,11 @@ HTMLContentSink::ProcessSTYLETag(const nsIParserNode& aNode) // Use the SRC attribute value to load the URL nsIURI* url = nsnull; #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - mDocumentBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mDocumentBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull); + NS_RELEASE(LoadGroup); } else #endif diff --git a/layout/html/document/src/nsHTMLDocument.cpp b/layout/html/document/src/nsHTMLDocument.cpp index e1c40451fdf..e498b545068 100644 --- a/layout/html/document/src/nsHTMLDocument.cpp +++ b/layout/html/document/src/nsHTMLDocument.cpp @@ -573,11 +573,11 @@ nsHTMLDocument:: SetBaseURL(const nsString& aURLSpec) NS_IF_RELEASE(mBaseURL); if (0 < aURLSpec.Length()) { #ifndef NECKO - nsIURLGroup* urlGroup = nsnull; - (void)mDocumentURL->GetURLGroup(&urlGroup); - if (urlGroup) { - result = urlGroup->CreateURL(&mBaseURL, mDocumentURL, aURLSpec, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + (void)mDocumentURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + result = LoadGroup->CreateURL(&mBaseURL, mDocumentURL, aURLSpec, nsnull); + NS_RELEASE(LoadGroup); } else #endif diff --git a/layout/html/style/src/nsCSSLoader.cpp b/layout/html/style/src/nsCSSLoader.cpp index c07a13b2787..fc052bbd28f 100644 --- a/layout/html/style/src/nsCSSLoader.cpp +++ b/layout/html/style/src/nsCSSLoader.cpp @@ -997,11 +997,11 @@ static nsIURI* CloneURL(nsIURI* aURL) if (urlStr) { nsAutoString buffer(urlStr); delete [] urlStr; - nsIURLGroup* urlGroup = nsnull; - aURL->GetURLGroup(&urlGroup); - if (urlGroup) { - urlGroup->CreateURL(&result, aURL, buffer, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + aURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + LoadGroup->CreateURL(&result, aURL, buffer, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO diff --git a/layout/html/style/src/nsCSSParser.cpp b/layout/html/style/src/nsCSSParser.cpp index d70e8fff554..24dea622693 100644 --- a/layout/html/style/src/nsCSSParser.cpp +++ b/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 // the url that follows a "?" nsIURI* url; - nsIURLGroup* urlGroup = nsnull; - mURL->GetURLGroup(&urlGroup); - if (urlGroup) { - aErrorCode = urlGroup->CreateURL(&url, mURL, aURLSpec, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + aErrorCode = LoadGroup->CreateURL(&url, mURL, aURLSpec, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO diff --git a/layout/style/nsCSSLoader.cpp b/layout/style/nsCSSLoader.cpp index c07a13b2787..fc052bbd28f 100644 --- a/layout/style/nsCSSLoader.cpp +++ b/layout/style/nsCSSLoader.cpp @@ -997,11 +997,11 @@ static nsIURI* CloneURL(nsIURI* aURL) if (urlStr) { nsAutoString buffer(urlStr); delete [] urlStr; - nsIURLGroup* urlGroup = nsnull; - aURL->GetURLGroup(&urlGroup); - if (urlGroup) { - urlGroup->CreateURL(&result, aURL, buffer, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + aURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + LoadGroup->CreateURL(&result, aURL, buffer, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO diff --git a/layout/style/nsCSSParser.cpp b/layout/style/nsCSSParser.cpp index d70e8fff554..24dea622693 100644 --- a/layout/style/nsCSSParser.cpp +++ b/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 // the url that follows a "?" nsIURI* url; - nsIURLGroup* urlGroup = nsnull; - mURL->GetURLGroup(&urlGroup); - if (urlGroup) { - aErrorCode = urlGroup->CreateURL(&url, mURL, aURLSpec, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + aErrorCode = LoadGroup->CreateURL(&url, mURL, aURLSpec, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO diff --git a/layout/xml/document/src/nsXMLContentSink.cpp b/layout/xml/document/src/nsXMLContentSink.cpp index 81a40c7f832..42e349b06a3 100644 --- a/layout/xml/document/src/nsXMLContentSink.cpp +++ b/layout/xml/document/src/nsXMLContentSink.cpp @@ -1003,14 +1003,14 @@ nsXMLContentSink::CreateStyleSheetURL(nsIURI** aUrl, { nsAutoString absURL; nsIURI* docURL = mDocument->GetDocumentURL(); - nsIURLGroup* urlGroup; + nsILoadGroup* LoadGroup; nsresult result = NS_OK; - result = docURL->GetURLGroup(&urlGroup); + result = docURL->GetLoadGroup(&LoadGroup); - if ((NS_SUCCEEDED(result)) && urlGroup) { - result = urlGroup->CreateURL(aUrl, docURL, aHref, nsnull); - NS_RELEASE(urlGroup); + if ((NS_SUCCEEDED(result)) && LoadGroup) { + result = LoadGroup->CreateURL(aUrl, docURL, aHref, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO @@ -1142,11 +1142,11 @@ nsXMLContentSink::ProcessStyleLink(nsIContent* aElement, if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase("text/css")) { nsIURI* url = nsnull; - nsIURLGroup* urlGroup = nsnull; - mDocumentBaseURL->GetURLGroup(&urlGroup); - if (urlGroup) { - result = urlGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); - NS_RELEASE(urlGroup); + nsILoadGroup* LoadGroup = nsnull; + mDocumentBaseURL->GetLoadGroup(&LoadGroup); + if (LoadGroup) { + result = LoadGroup->CreateURL(&url, mDocumentBaseURL, aHref, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO @@ -1764,13 +1764,13 @@ nsXMLContentSink::ProcessStartSCRIPTTag(const nsIParserNode& aNode) nsIURI* url = nsnull; nsAutoString absURL; nsIURI* docURL = mDocument->GetDocumentURL(); - nsIURLGroup* urlGroup; + nsILoadGroup* LoadGroup; - rv = docURL->GetURLGroup(&urlGroup); + rv = docURL->GetLoadGroup(&LoadGroup); - if ((NS_OK == rv) && urlGroup) { - rv = urlGroup->CreateURL(&url, docURL, src, nsnull); - NS_RELEASE(urlGroup); + if ((NS_OK == rv) && LoadGroup) { + rv = LoadGroup->CreateURL(&url, docURL, src, nsnull); + NS_RELEASE(LoadGroup); } else { #ifndef NECKO diff --git a/mailnews/base/util/nsMsgMailNewsUrl.cpp b/mailnews/base/util/nsMsgMailNewsUrl.cpp index 28b576fc79a..d5f28966252 100644 --- a/mailnews/base/util/nsMsgMailNewsUrl.cpp +++ b/mailnews/base/util/nsMsgMailNewsUrl.cpp @@ -420,12 +420,12 @@ nsresult nsMsgMailNewsUrl::SetLoadAttribs(nsILoadAttribs* aLoadAttribs) return NS_OK; } -nsresult nsMsgMailNewsUrl::GetURLGroup(nsIURLGroup* *result) const +nsresult nsMsgMailNewsUrl::GetLoadGroup(nsILoadGroup* *result) const { return NS_OK; } -nsresult nsMsgMailNewsUrl::SetURLGroup(nsIURLGroup* group) +nsresult nsMsgMailNewsUrl::SetLoadGroup(nsILoadGroup* group) { NS_ASSERTION(m_URL_s == nsnull, "URL has already been opened"); return NS_OK; diff --git a/mailnews/base/util/nsMsgMailNewsUrl.h b/mailnews/base/util/nsMsgMailNewsUrl.h index 338fe0db572..861af46adb9 100644 --- a/mailnews/base/util/nsMsgMailNewsUrl.h +++ b/mailnews/base/util/nsMsgMailNewsUrl.h @@ -95,8 +95,8 @@ public: NS_IMETHOD SetContainer(nsISupports* container); NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const; // make obsolete NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs); // make obsolete - NS_IMETHOD GetURLGroup(nsIURLGroup* *result) const; // make obsolete - NS_IMETHOD SetURLGroup(nsIURLGroup* group); // make obsolete + NS_IMETHOD GetLoadGroup(nsILoadGroup* *result) const; // make obsolete + NS_IMETHOD SetLoadGroup(nsILoadGroup* group); // make obsolete NS_IMETHOD SetPostHeader(const char* name, const char* value); // make obsolete NS_IMETHOD SetPostData(nsIInputStream* input); // make obsolete NS_IMETHOD GetContentLength(PRInt32 *len); diff --git a/network/module/nsHttpURLFactory.cpp b/network/module/nsHttpURLFactory.cpp index 3a33ea1a97a..904f744cbaa 100644 --- a/network/module/nsHttpURLFactory.cpp +++ b/network/module/nsHttpURLFactory.cpp @@ -36,7 +36,7 @@ public: const nsString& aSpec, const nsIURI* aContextURL = nsnull, nsISupports* aContainer = nsnull, - nsIURLGroup* aGroup = nsnull); + nsILoadGroup* aGroup = nsnull); //////////////////////////////////////////////////////////////////////////// // nsHttpURLFactory: @@ -65,7 +65,7 @@ nsHttpURLFactory::CreateURL(nsIURI* *aResult, const nsString& aSpec, const nsIURI* aContextURL, nsISupports* aContainer, - nsIURLGroup* aGroup) + nsILoadGroup* aGroup) { nsHttpUrlImpl* url = new nsHttpUrlImpl(aContainer, aGroup); if (url == NULL) diff --git a/network/module/nsHttpUrl.cpp b/network/module/nsHttpUrl.cpp index 8ba0901226d..28f7b4b5b7b 100644 --- a/network/module/nsHttpUrl.cpp +++ b/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(kIProtocolConnectionIID, NS_IPROTOCOLCONNECTION_IID); -nsHttpUrlImpl::nsHttpUrlImpl(nsISupports* aContainer, nsIURLGroup* aGroup) +nsHttpUrlImpl::nsHttpUrlImpl(nsISupports* aContainer, nsILoadGroup* aGroup) { NS_INIT_REFCNT(); @@ -55,11 +55,11 @@ nsHttpUrlImpl::nsHttpUrlImpl(nsISupports* aContainer, nsIURLGroup* aGroup) mSpec = nsnull; mSearch = nsnull; mContainer = nsnull; - mURLGroup = aGroup; + mLoadGroup = aGroup; 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; // 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() { // NS_IF_RELEASE(mContainer); - // NS_IF_RELEASE(mURLGroup); + // NS_IF_RELEASE(mLoadGroup); PR_FREEIF(mSpec); PR_FREEIF(mProtocol); @@ -852,22 +852,22 @@ nsresult nsHttpUrlImpl::SetLoadAttribs(nsILoadAttribs* aLoadAttribs) return NS_OK; } -nsresult nsHttpUrlImpl::GetURLGroup(nsIURLGroup* *result) const +nsresult nsHttpUrlImpl::GetLoadGroup(nsILoadGroup* *result) const { NS_LOCK_INSTANCE(); - *result = mURLGroup; - NS_IF_ADDREF(mURLGroup); // getters must |AddRef| their result, even if they didn'st already own it + *result = mLoadGroup; + NS_IF_ADDREF(mLoadGroup); // getters must |AddRef| their result, even if they didn'st already own it NS_UNLOCK_INSTANCE(); 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_LOCK_INSTANCE(); - // NS_IF_RELEASE(mURLGroup); - mURLGroup = group; - // NS_IF_ADDREF(mURLGroup); + // NS_IF_RELEASE(mLoadGroup); + mLoadGroup = group; + // NS_IF_ADDREF(mLoadGroup); NS_UNLOCK_INSTANCE(); return NS_OK; } diff --git a/network/module/nsHttpUrl.h b/network/module/nsHttpUrl.h index ad39ae8341a..73f9b97d796 100644 --- a/network/module/nsHttpUrl.h +++ b/network/module/nsHttpUrl.h @@ -51,8 +51,8 @@ public: NS_IMETHOD SetContainer(nsISupports* container); NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const; NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs); - NS_IMETHOD GetURLGroup(nsIURLGroup* *result) const; - NS_IMETHOD SetURLGroup(nsIURLGroup* group); + NS_IMETHOD GetLoadGroup(nsILoadGroup* *result) const; + NS_IMETHOD SetLoadGroup(nsILoadGroup* group); NS_IMETHOD SetPostHeader(const char* name, const char* value); NS_IMETHOD SetPostData(nsIInputStream* input); NS_IMETHOD GetContentLength(PRInt32 *len); @@ -73,7 +73,7 @@ public: Send_DataFromFile } SendType; - nsHttpUrlImpl(nsISupports* aContainer, nsIURLGroup* aGroup); + nsHttpUrlImpl(nsISupports* aContainer, nsILoadGroup* aGroup); NS_DECL_ISUPPORTS @@ -113,7 +113,7 @@ protected: nsCOMPtr mPostData; nsISupports* mContainer; // explicitly changed to no longer own its container nsCOMPtr mLoadAttribs; - nsIURLGroup* mURLGroup; // explicitly changed to no longer own its group + nsILoadGroup* mLoadGroup; // explicitly changed to no longer own its group }; #endif // nsHttpUrl_h__ diff --git a/network/module/nsINetService.h b/network/module/nsINetService.h index 8415865a554..d37c490d619 100644 --- a/network/module/nsINetService.h +++ b/network/module/nsINetService.h @@ -227,7 +227,7 @@ struct nsINetService : public nsISupports const nsString& aSpec, const nsIURI* aContextURL = nsnull, nsISupports* aContainer = nsnull, - nsIURLGroup* aGroup = nsnull) = 0; + nsILoadGroup* aGroup = nsnull) = 0; /** * Protocol connection pools should use this call into the service manager to diff --git a/network/module/nsIProtocolURLFactory.h b/network/module/nsIProtocolURLFactory.h index 3c1f5cb5012..79f4a29f4e7 100644 --- a/network/module/nsIProtocolURLFactory.h +++ b/network/module/nsIProtocolURLFactory.h @@ -24,7 +24,7 @@ class nsString; class nsIURI; -class nsIURLGroup; +class nsILoadGroup; #define NS_IPROTOCOLURLFACTORY_IID \ { /* aed57ad0-705e-11d2-8166-006008119d7a */ \ @@ -51,7 +51,7 @@ public: const nsString& aSpec, const nsIURI* aContextURL = nsnull, nsISupports* aContainer = nsnull, - nsIURLGroup* aGroup = nsnull) = 0; + nsILoadGroup* aGroup = nsnull) = 0; }; #endif /* nsIIProtocolURLFactory_h___ */ diff --git a/network/module/nsIURLGroup.h b/network/module/nsIURLGroup.h index d299452ba7d..52249a93f84 100644 --- a/network/module/nsIURLGroup.h +++ b/network/module/nsIURLGroup.h @@ -29,15 +29,15 @@ class nsIStreamListener; class nsILoadAttribs; /* {a4071430-5263-11d2-929b-00105a1b0d64} */ -#define NS_IURLGROUP_IID \ +#define NS_ILOADGROUP_IID \ { 0xa4071430, 0x5263, 0x11d2, \ {0x92, 0x9b, 0x00, 0x10, 0x5a, 0x1b, 0x0d, 0x64} } -class nsIURLGroup : public nsISupports +class nsILoadGroup : public nsISupports { 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 @@ -71,7 +71,7 @@ public: 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 * instance. @@ -81,34 +81,34 @@ public: 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 - * nsIURLGroup and its children. + * nsILoadGroup and its children. * * @return Returns NS_OK if successful, otherwise NS_ERROR_FAILURE. */ 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 * of its parent... * * @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. */ - NS_IMETHOD RemoveChildGroup(nsIURLGroup* aGroup) = 0; + NS_IMETHOD RemoveChildGroup(nsILoadGroup* aGroup) = 0; }; #endif /* nsIURLGroup_h__ */ diff --git a/network/module/nsNetService.cpp b/network/module/nsNetService.cpp index d590cd606a2..63f2fed8c8c 100644 --- a/network/module/nsNetService.cpp +++ b/network/module/nsNetService.cpp @@ -1044,7 +1044,7 @@ nsNetlibService::CreateURL(nsIURI* *aURL, const nsString& aSpec, const nsIURI* aContextURL, nsISupports* aContainer, - nsIURLGroup* aGroup) + nsILoadGroup* aGroup) { nsAutoString protoName; PRInt32 pos = aSpec.Find(':'); @@ -1117,7 +1117,7 @@ NS_NET nsresult NS_NewURL(nsIURI** aInstancePtrResult, const nsString& aSpec, const nsIURI* aURL, nsISupports* aContainer, - nsIURLGroup* aGroup) + nsILoadGroup* aGroup) { NS_PRECONDITION(nsnull != aInstancePtrResult, "null ptr"); if (nsnull == aInstancePtrResult) { @@ -1172,9 +1172,9 @@ NS_NET nsresult NS_MakeAbsoluteURL(nsIURI* aURL, NS_NET nsresult NS_OpenURL(nsIURI* aURL, nsIStreamListener* aConsumer) { nsresult rv; - nsIURLGroup* group = nsnull; + nsILoadGroup* group = nsnull; - rv = aURL->GetURLGroup(&group); + rv = aURL->GetLoadGroup(&group); if (NS_SUCCEEDED(rv)) { if (nsnull != group) { rv = group->OpenStream(aURL, aConsumer); diff --git a/network/module/nsNetService.h b/network/module/nsNetService.h index 406b443ce00..8a33933b420 100644 --- a/network/module/nsNetService.h +++ b/network/module/nsNetService.h @@ -82,7 +82,7 @@ public: const nsString& aSpec, const nsIURI* aContextURL = nsnull, nsISupports* aContainer = nsnull, - nsIURLGroup* aGroup = nsnull); + nsILoadGroup* aGroup = nsnull); NS_IMETHOD AreThereActiveConnections(void); NS_IMETHOD CreateSocketTransport(nsITransport **aTransport, PRUint32 aPortToUse, const char * aHostName); diff --git a/network/public/nsIURL.h b/network/public/nsIURL.h index 69c2b2770e6..9938d70c65e 100644 --- a/network/public/nsIURL.h +++ b/network/public/nsIURL.h @@ -26,7 +26,7 @@ class nsIInputStream; class nsIStreamListener; class nsString; -class nsIURLGroup; +class nsILoadGroup; #define NS_IURL_IID \ { 0x6ecb2900, 0x93b5, 0x11d1, \ @@ -82,8 +82,8 @@ public: NS_IMETHOD GetLoadAttribs(nsILoadAttribs* *result) const = 0; NS_IMETHOD SetLoadAttribs(nsILoadAttribs* loadAttribs) = 0; - NS_IMETHOD GetURLGroup(nsIURLGroup* *result) const = 0; - NS_IMETHOD SetURLGroup(nsIURLGroup* group) = 0; + NS_IMETHOD GetLoadGroup(nsILoadGroup* *result) const = 0; + NS_IMETHOD SetLoadGroup(nsILoadGroup* group) = 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 nsIURI* aBaseURL = nsnull, nsISupports* aContainer = nsnull, - nsIURLGroup* aGroup = nsnull); + nsILoadGroup* aGroup = nsnull); /** * Utility routine to take a url (may be nsnull) and a base url (may diff --git a/rdf/content/src/nsXULDocument.cpp b/rdf/content/src/nsXULDocument.cpp index 40911336121..a05b88c59c8 100644 --- a/rdf/content/src/nsXULDocument.cpp +++ b/rdf/content/src/nsXULDocument.cpp @@ -432,7 +432,7 @@ public: virtual nsIURI* GetDocumentURL() const; - virtual nsIURLGroup* GetDocumentURLGroup() const; + virtual nsIURLGroup* GetDocumentLoadGroup() const; NS_IMETHOD GetBaseURL(nsIURI*& aURL) const; @@ -1359,7 +1359,7 @@ XULDocumentImpl::GetDocumentURL() const } nsIURLGroup* -XULDocumentImpl::GetDocumentURLGroup() const +XULDocumentImpl::GetDocumentLoadGroup() const { nsIURLGroup* result = mDocumentURLGroup; NS_IF_ADDREF(result);