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

- Backed out changes that sent notifications out to observers via the nsIExternalDocumentLoadObserver interface. 

- Thanks a lot to Eric Burley (ericb@neoplanet.com) for fixing refcount related bugs.  His patch is included in this checkin.
This commit is contained in:
nisheeth%netscape.com 1999-04-28 04:57:06 +00:00
Родитель b07fa19d17
Коммит 251fa6ad71
2 изменённых файлов: 6 добавлений и 304 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@ -35,7 +35,6 @@
#include "nsIRefreshUrl.h"
#include "nsITimer.h"
#include "nsIDocumentLoaderObserver.h"
#include "nsIExternalDocLoadObs.h"
#include "nsVoidArray.h"
#include "nsIHttpURL.h"
#include "nsILoadAttribs.h"
@ -864,7 +863,6 @@ public:
void SetDocumentUrl(nsIURL* aUrl);
protected:
virtual ~nsDocLoaderImpl();
void BuildExternalDocLoadOberverList(void);
private:
static PRBool StopBindInfoEnumerator (nsISupports* aElement, void* aData);
@ -897,11 +895,6 @@ protected:
* notification is fired...
*/
PRBool mIsLoadingDocument;
/* The list of external document load observers. These observers monitor
the document load progress by registering as observers with the observer
service under the topic "Webshell/DocumentLoad" */
nsVoidArray mExternalObservers;
};
@ -1033,6 +1026,7 @@ nsDocLoaderImpl::GetDocumentFactory(nsIDocumentLoaderFactory** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec,
const char* aCommand,
@ -1062,18 +1056,6 @@ nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec,
goto done;
}
/* In case this is a top level document loader, look up
* external document load observers and add them to the
* list. The observers; refcounts are not incremented because the
* observer list is rebuilt from scratch for each document load.
* The observer is expected to unregister itself with the observer
* service only between document loads, not while a document load is
* going on.
*/
if (nsnull == mParent) {
BuildExternalDocLoadOberverList();
}
NS_NEWXPCOM(loader, nsDocumentBindInfo);
if (nsnull == loader) {
rv = NS_ERROR_OUT_OF_MEMORY;
@ -1422,27 +1404,6 @@ void nsDocLoaderImpl::FireOnStartDocumentLoad(nsIURL* aURL,
if (nsnull != mParent) {
mParent->FireOnStartDocumentLoad(aURL, aCommand);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar* temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnStartDocumentLoad((PRUint32) mContainer, url, aCommand);
}
}
}
}
void nsDocLoaderImpl::FireOnEndDocumentLoad(PRInt32 aStatus)
@ -1464,27 +1425,6 @@ void nsDocLoaderImpl::FireOnEndDocumentLoad(PRInt32 aStatus)
if (nsnull != mParent) {
mParent->FireOnEndDocumentLoad(aStatus);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
mDocumentUrl->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnEndDocumentLoad((PRUint32) mContainer, url, aStatus);
}
}
}
}
void nsDocLoaderImpl::FireOnStartURLLoad(nsIURL* aURL, const char* aContentType,
@ -1507,27 +1447,6 @@ void nsDocLoaderImpl::FireOnStartURLLoad(nsIURL* aURL, const char* aContentType,
if (nsnull != mParent) {
mParent->FireOnStartURLLoad(aURL, aContentType, aViewer);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnStartURLLoad((PRUint32) mContainer, url, aContentType);
}
}
}
}
void nsDocLoaderImpl::FireOnProgressURLLoad(nsIURL* aURL, PRUint32 aProgress,
@ -1550,27 +1469,6 @@ void nsDocLoaderImpl::FireOnProgressURLLoad(nsIURL* aURL, PRUint32 aProgress,
if (nsnull != mParent) {
mParent->FireOnProgressURLLoad(aURL, aProgress, aProgressMax);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnProgressURLLoad((PRUint32) mContainer, url, aProgress, aProgressMax);
}
}
}
}
void nsDocLoaderImpl::FireOnStatusURLLoad(nsIURL* aURL, nsString& aMsg)
@ -1592,26 +1490,6 @@ void nsDocLoaderImpl::FireOnStatusURLLoad(nsIURL* aURL, nsString& aMsg)
if (nsnull != mParent) {
mParent->FireOnStatusURLLoad(aURL, aMsg);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnStatusURLLoad((PRUint32) mContainer, url, aMsg);
}
}
}
}
void nsDocLoaderImpl::FireOnEndURLLoad(nsIURL* aURL, PRInt32 aStatus)
@ -1633,26 +1511,6 @@ void nsDocLoaderImpl::FireOnEndURLLoad(nsIURL* aURL, PRInt32 aStatus)
if (nsnull != mParent) {
mParent->FireOnEndURLLoad(aURL, aStatus);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnEndURLLoad((PRUint32) mContainer, url, aStatus);
}
}
}
}
@ -1821,13 +1679,6 @@ PRBool nsDocLoaderImpl::IsBusyEnumerator(void* aElement, void* aData)
return !(*result);
}
/* Look up external document load observers by consulting the observer service and
add them to mExternalObservers. */
void nsDocLoaderImpl::BuildExternalDocLoadOberverList(void)
{
}
/****************************************************************************
* nsDocumentBindInfo implementation...
****************************************************************************/
@ -1961,6 +1812,7 @@ nsresult nsDocumentBindInfo::Bind(const nsString& aURLSpec,
else {
pts->SendData(data, aPostData->GetDataLength());
}
NS_RELEASE(pts);
}
}
@ -2373,7 +2225,6 @@ nsDocLoaderServiceFactory::CreateInstance(nsISupports *aOuter,
rv = NS_ERROR_OUT_OF_MEMORY;
goto done;
}
NS_ADDREF(gServiceInstance);
}
// If the QI fails, the component will be destroyed...

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

@ -35,7 +35,6 @@
#include "nsIRefreshUrl.h"
#include "nsITimer.h"
#include "nsIDocumentLoaderObserver.h"
#include "nsIExternalDocLoadObs.h"
#include "nsVoidArray.h"
#include "nsIHttpURL.h"
#include "nsILoadAttribs.h"
@ -864,7 +863,6 @@ public:
void SetDocumentUrl(nsIURL* aUrl);
protected:
virtual ~nsDocLoaderImpl();
void BuildExternalDocLoadOberverList(void);
private:
static PRBool StopBindInfoEnumerator (nsISupports* aElement, void* aData);
@ -897,11 +895,6 @@ protected:
* notification is fired...
*/
PRBool mIsLoadingDocument;
/* The list of external document load observers. These observers monitor
the document load progress by registering as observers with the observer
service under the topic "Webshell/DocumentLoad" */
nsVoidArray mExternalObservers;
};
@ -1033,6 +1026,7 @@ nsDocLoaderImpl::GetDocumentFactory(nsIDocumentLoaderFactory** aResult)
return NS_OK;
}
NS_IMETHODIMP
nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec,
const char* aCommand,
@ -1062,18 +1056,6 @@ nsDocLoaderImpl::LoadDocument(const nsString& aURLSpec,
goto done;
}
/* In case this is a top level document loader, look up
* external document load observers and add them to the
* list. The observers; refcounts are not incremented because the
* observer list is rebuilt from scratch for each document load.
* The observer is expected to unregister itself with the observer
* service only between document loads, not while a document load is
* going on.
*/
if (nsnull == mParent) {
BuildExternalDocLoadOberverList();
}
NS_NEWXPCOM(loader, nsDocumentBindInfo);
if (nsnull == loader) {
rv = NS_ERROR_OUT_OF_MEMORY;
@ -1422,27 +1404,6 @@ void nsDocLoaderImpl::FireOnStartDocumentLoad(nsIURL* aURL,
if (nsnull != mParent) {
mParent->FireOnStartDocumentLoad(aURL, aCommand);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar* temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnStartDocumentLoad((PRUint32) mContainer, url, aCommand);
}
}
}
}
void nsDocLoaderImpl::FireOnEndDocumentLoad(PRInt32 aStatus)
@ -1464,27 +1425,6 @@ void nsDocLoaderImpl::FireOnEndDocumentLoad(PRInt32 aStatus)
if (nsnull != mParent) {
mParent->FireOnEndDocumentLoad(aStatus);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
mDocumentUrl->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnEndDocumentLoad((PRUint32) mContainer, url, aStatus);
}
}
}
}
void nsDocLoaderImpl::FireOnStartURLLoad(nsIURL* aURL, const char* aContentType,
@ -1507,27 +1447,6 @@ void nsDocLoaderImpl::FireOnStartURLLoad(nsIURL* aURL, const char* aContentType,
if (nsnull != mParent) {
mParent->FireOnStartURLLoad(aURL, aContentType, aViewer);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnStartURLLoad((PRUint32) mContainer, url, aContentType);
}
}
}
}
void nsDocLoaderImpl::FireOnProgressURLLoad(nsIURL* aURL, PRUint32 aProgress,
@ -1550,27 +1469,6 @@ void nsDocLoaderImpl::FireOnProgressURLLoad(nsIURL* aURL, PRUint32 aProgress,
if (nsnull != mParent) {
mParent->FireOnProgressURLLoad(aURL, aProgress, aProgressMax);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnProgressURLLoad((PRUint32) mContainer, url, aProgress, aProgressMax);
}
}
}
}
void nsDocLoaderImpl::FireOnStatusURLLoad(nsIURL* aURL, nsString& aMsg)
@ -1592,26 +1490,6 @@ void nsDocLoaderImpl::FireOnStatusURLLoad(nsIURL* aURL, nsString& aMsg)
if (nsnull != mParent) {
mParent->FireOnStatusURLLoad(aURL, aMsg);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnStatusURLLoad((PRUint32) mContainer, url, aMsg);
}
}
}
}
void nsDocLoaderImpl::FireOnEndURLLoad(nsIURL* aURL, PRInt32 aStatus)
@ -1633,26 +1511,6 @@ void nsDocLoaderImpl::FireOnEndURLLoad(nsIURL* aURL, PRInt32 aStatus)
if (nsnull != mParent) {
mParent->FireOnEndURLLoad(aURL, aStatus);
}
/*
* If this is the top level document loader, notify external
* document load observers.
*/
if (nsnull == mParent) {
count = mExternalObservers.Count();
if (count > 0) {
nsIExternalDocumentLoadObserver* observer = nsnull;
PRUnichar *temp;
aURL->ToString(&temp);
nsAutoString url(temp);
delete [] temp;
for (index = 0; index < count; index++) {
observer = (nsIExternalDocumentLoadObserver*) mExternalObservers.ElementAt(index);
observer->OnEndURLLoad((PRUint32) mContainer, url, aStatus);
}
}
}
}
@ -1821,13 +1679,6 @@ PRBool nsDocLoaderImpl::IsBusyEnumerator(void* aElement, void* aData)
return !(*result);
}
/* Look up external document load observers by consulting the observer service and
add them to mExternalObservers. */
void nsDocLoaderImpl::BuildExternalDocLoadOberverList(void)
{
}
/****************************************************************************
* nsDocumentBindInfo implementation...
****************************************************************************/
@ -1961,6 +1812,7 @@ nsresult nsDocumentBindInfo::Bind(const nsString& aURLSpec,
else {
pts->SendData(data, aPostData->GetDataLength());
}
NS_RELEASE(pts);
}
}
@ -2373,7 +2225,6 @@ nsDocLoaderServiceFactory::CreateInstance(nsISupports *aOuter,
rv = NS_ERROR_OUT_OF_MEMORY;
goto done;
}
NS_ADDREF(gServiceInstance);
}
// If the QI fails, the component will be destroyed...