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

Changed URLGroup to LoadGroup

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

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

@ -432,7 +432,7 @@ public:
virtual nsIURI* GetDocumentURL() const;
virtual nsIURLGroup* GetDocumentLoadGroup() const;
virtual nsILoadGroup* GetDocumentLoadGroup() const;
NS_IMETHOD GetBaseURL(nsIURI*& aURL) const;
@ -753,7 +753,7 @@ protected:
nsVoidArray mObservers;
nsAutoString mDocumentTitle;
nsCOMPtr<nsIURI> mDocumentURL; // [OWNER] ??? compare with loader
nsCOMPtr<nsIURLGroup> mDocumentURLGroup; // [OWNER] leads to loader
nsCOMPtr<nsILoadGroup> mDocumentLoadGroup; // [OWNER] leads to loader
nsCOMPtr<nsIContent> mRootContent; // [OWNER]
nsIDocument* mParentDocument; // [WEAK]
nsIScriptContextOwner* mScriptContextOwner; // [WEAK] it owns me! (indirectly)
@ -1096,7 +1096,7 @@ XULDocumentImpl::PrepareToLoad( nsCOMPtr<nsIParser>* created_parser,
mDocumentTitle.Truncate();
mDocumentURL = syntheticURL;
syntheticURL->GetURLGroup(getter_AddRefs(mDocumentURLGroup));
syntheticURL->GetLoadGroup(getter_AddRefs(mDocumentLoadGroup));
SetDocumentURLAndGroup(syntheticURL);
@ -1295,7 +1295,7 @@ void
XULDocumentImpl::SetDocumentURLAndGroup(nsIURI* anURL)
{
mDocumentURL = dont_QueryInterface(anURL);
anURL->GetURLGroup(getter_AddRefs(mDocumentURLGroup));
anURL->GetLoadGroup(getter_AddRefs(mDocumentLoadGroup));
}
NS_IMETHODIMP
@ -1358,10 +1358,10 @@ XULDocumentImpl::GetDocumentURL() const
return result;
}
nsIURLGroup*
nsILoadGroup*
XULDocumentImpl::GetDocumentLoadGroup() const
{
nsIURLGroup* result = mDocumentURLGroup;
nsILoadGroup* result = mDocumentLoadGroup;
NS_IF_ADDREF(result);
return result;
}

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

@ -432,7 +432,7 @@ public:
virtual nsIURI* GetDocumentURL() const;
virtual nsIURLGroup* GetDocumentLoadGroup() const;
virtual nsILoadGroup* GetDocumentLoadGroup() const;
NS_IMETHOD GetBaseURL(nsIURI*& aURL) const;
@ -753,7 +753,7 @@ protected:
nsVoidArray mObservers;
nsAutoString mDocumentTitle;
nsCOMPtr<nsIURI> mDocumentURL; // [OWNER] ??? compare with loader
nsCOMPtr<nsIURLGroup> mDocumentURLGroup; // [OWNER] leads to loader
nsCOMPtr<nsILoadGroup> mDocumentLoadGroup; // [OWNER] leads to loader
nsCOMPtr<nsIContent> mRootContent; // [OWNER]
nsIDocument* mParentDocument; // [WEAK]
nsIScriptContextOwner* mScriptContextOwner; // [WEAK] it owns me! (indirectly)
@ -1096,7 +1096,7 @@ XULDocumentImpl::PrepareToLoad( nsCOMPtr<nsIParser>* created_parser,
mDocumentTitle.Truncate();
mDocumentURL = syntheticURL;
syntheticURL->GetURLGroup(getter_AddRefs(mDocumentURLGroup));
syntheticURL->GetLoadGroup(getter_AddRefs(mDocumentLoadGroup));
SetDocumentURLAndGroup(syntheticURL);
@ -1295,7 +1295,7 @@ void
XULDocumentImpl::SetDocumentURLAndGroup(nsIURI* anURL)
{
mDocumentURL = dont_QueryInterface(anURL);
anURL->GetURLGroup(getter_AddRefs(mDocumentURLGroup));
anURL->GetLoadGroup(getter_AddRefs(mDocumentLoadGroup));
}
NS_IMETHODIMP
@ -1358,10 +1358,10 @@ XULDocumentImpl::GetDocumentURL() const
return result;
}
nsIURLGroup*
nsILoadGroup*
XULDocumentImpl::GetDocumentLoadGroup() const
{
nsIURLGroup* result = mDocumentURLGroup;
nsILoadGroup* result = mDocumentLoadGroup;
NS_IF_ADDREF(result);
return result;
}

20
rdf/datasource/src/nsXULContentSink.cpp
Просмотреть файл

@ -743,11 +743,11 @@ XULContentSinkImpl::ProcessStyleLink(nsIContent* aElement,
if ((0 == mimeType.Length()) || mimeType.EqualsIgnoreCase(kCSSType)) {
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
@ -1437,13 +1437,13 @@ XULContentSinkImpl::OpenScript(const nsIParserNode& aNode)
// Use the SRC attribute value to load the URL
nsIURI* url = nsnull;
nsAutoString absURL;
nsIURLGroup* urlGroup;
nsILoadGroup* LoadGroup;
rv = mDocumentBaseURL->GetURLGroup(&urlGroup);
rv = mDocumentBaseURL->GetLoadGroup(&LoadGroup);
if ((NS_OK == rv) && urlGroup) {
rv = urlGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull);
NS_RELEASE(urlGroup);
if ((NS_OK == rv) && LoadGroup) {
rv = LoadGroup->CreateURL(&url, mDocumentBaseURL, src, nsnull);
NS_RELEASE(LoadGroup);
}
else {
#ifndef NECKO

20
uriloader/base/nsDocLoader.cpp
Просмотреть файл

@ -82,7 +82,7 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
#ifndef NECKO
static NS_DEFINE_IID(kIURLGroupIID, NS_IURLGROUP_IID);
static NS_DEFINE_IID(kILoadGroupIID, NS_ILOADGROUP_IID);
static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID);
static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
#else
@ -163,7 +163,7 @@ protected:
****************************************************************************/
#ifndef NECKO
class nsDocLoaderImpl : public nsIDocumentLoader, public nsIURLGroup
class nsDocLoaderImpl : public nsIDocumentLoader, public nsILoadGroup
#else
class nsDocLoaderImpl : public nsIDocumentLoader
#endif // NECKO
@ -207,7 +207,7 @@ public:
nsIContentViewerContainer** aResult);
#ifndef NECKO
// nsIURLGroup interface...
// nsILoadGroup interface...
NS_IMETHOD CreateURL(nsIURI** aInstancePtrResult,
nsIURI* aBaseURL,
const nsString& aSpec,
@ -219,8 +219,8 @@ public:
NS_IMETHOD GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs);
NS_IMETHOD SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs);
NS_IMETHOD AddChildGroup(nsIURLGroup* aGroup);
NS_IMETHOD RemoveChildGroup(nsIURLGroup* aGroup);
NS_IMETHOD AddChildGroup(nsILoadGroup* aGroup);
NS_IMETHOD RemoveChildGroup(nsILoadGroup* aGroup);
#endif // NECKO
// Implementation specific methods...
@ -367,8 +367,8 @@ nsDocLoaderImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
return NS_OK;
}
#ifndef NECKO
if (aIID.Equals(kIURLGroupIID)) {
*aInstancePtr = (void*)(nsIURLGroup*)this;
if (aIID.Equals(kILoadGroupIID)) {
*aInstancePtr = (void*)(nsILoadGroup*)this;
NS_ADDREF_THIS();
return NS_OK;
}
@ -797,7 +797,7 @@ nsDocLoaderImpl::SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs)
PRInt32 index;
for (index = 0; index < count; index++) {
nsIURLGroup* child = (nsIURLGroup*)mChildGroupList.ElementAt(index);
nsILoadGroup* child = (nsILoadGroup*)mChildGroupList.ElementAt(index);
child->SetDefaultLoadAttributes(m_LoadAttrib);
}
@ -806,7 +806,7 @@ nsDocLoaderImpl::SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs)
NS_IMETHODIMP
nsDocLoaderImpl::AddChildGroup(nsIURLGroup* aGroup)
nsDocLoaderImpl::AddChildGroup(nsILoadGroup* aGroup)
{
mChildGroupList.AppendElement(aGroup);
return NS_OK;
@ -814,7 +814,7 @@ nsDocLoaderImpl::AddChildGroup(nsIURLGroup* aGroup)
NS_IMETHODIMP
nsDocLoaderImpl::RemoveChildGroup(nsIURLGroup* aGroup)
nsDocLoaderImpl::RemoveChildGroup(nsILoadGroup* aGroup)
{
nsresult rv = NS_OK;

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

@ -82,7 +82,7 @@ static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIDocumentIID, NS_IDOCUMENT_IID);
static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
#ifndef NECKO
static NS_DEFINE_IID(kIURLGroupIID, NS_IURLGROUP_IID);
static NS_DEFINE_IID(kILoadGroupIID, NS_ILOADGROUP_IID);
static NS_DEFINE_IID(kINetServiceIID, NS_INETSERVICE_IID);
static NS_DEFINE_IID(kNetServiceCID, NS_NETSERVICE_CID);
#else
@ -163,7 +163,7 @@ protected:
****************************************************************************/
#ifndef NECKO
class nsDocLoaderImpl : public nsIDocumentLoader, public nsIURLGroup
class nsDocLoaderImpl : public nsIDocumentLoader, public nsILoadGroup
#else
class nsDocLoaderImpl : public nsIDocumentLoader
#endif // NECKO
@ -207,7 +207,7 @@ public:
nsIContentViewerContainer** aResult);
#ifndef NECKO
// nsIURLGroup interface...
// nsILoadGroup interface...
NS_IMETHOD CreateURL(nsIURI** aInstancePtrResult,
nsIURI* aBaseURL,
const nsString& aSpec,
@ -219,8 +219,8 @@ public:
NS_IMETHOD GetDefaultLoadAttributes(nsILoadAttribs*& aLoadAttribs);
NS_IMETHOD SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs);
NS_IMETHOD AddChildGroup(nsIURLGroup* aGroup);
NS_IMETHOD RemoveChildGroup(nsIURLGroup* aGroup);
NS_IMETHOD AddChildGroup(nsILoadGroup* aGroup);
NS_IMETHOD RemoveChildGroup(nsILoadGroup* aGroup);
#endif // NECKO
// Implementation specific methods...
@ -367,8 +367,8 @@ nsDocLoaderImpl::QueryInterface(REFNSIID aIID, void** aInstancePtr)
return NS_OK;
}
#ifndef NECKO
if (aIID.Equals(kIURLGroupIID)) {
*aInstancePtr = (void*)(nsIURLGroup*)this;
if (aIID.Equals(kILoadGroupIID)) {
*aInstancePtr = (void*)(nsILoadGroup*)this;
NS_ADDREF_THIS();
return NS_OK;
}
@ -797,7 +797,7 @@ nsDocLoaderImpl::SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs)
PRInt32 index;
for (index = 0; index < count; index++) {
nsIURLGroup* child = (nsIURLGroup*)mChildGroupList.ElementAt(index);
nsILoadGroup* child = (nsILoadGroup*)mChildGroupList.ElementAt(index);
child->SetDefaultLoadAttributes(m_LoadAttrib);
}
@ -806,7 +806,7 @@ nsDocLoaderImpl::SetDefaultLoadAttributes(nsILoadAttribs* aLoadAttribs)
NS_IMETHODIMP
nsDocLoaderImpl::AddChildGroup(nsIURLGroup* aGroup)
nsDocLoaderImpl::AddChildGroup(nsILoadGroup* aGroup)
{
mChildGroupList.AppendElement(aGroup);
return NS_OK;
@ -814,7 +814,7 @@ nsDocLoaderImpl::AddChildGroup(nsIURLGroup* aGroup)
NS_IMETHODIMP
nsDocLoaderImpl::RemoveChildGroup(nsIURLGroup* aGroup)
nsDocLoaderImpl::RemoveChildGroup(nsILoadGroup* aGroup)
{
nsresult rv = NS_OK;