Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 15586. Call nsIRDFXMLSinkObservers on synchronous load, too. r=dougt, sr=alecf

Browse Source
This commit is contained in:
waterson%netscape.com 2001-02-20 03:31:24 +00:00
parent 2cba298f69
commit 51a80d843f
1 changed files with 42 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
rdf/base/src/nsRDFXMLDataSource.cpp
View File

@ -437,6 +437,10 @@ public:
PRBool
IsA(nsIRDFDataSource* aDataSource, nsIRDFResource* aResource, nsIRDFResource* aType);
protected:
nsresult
BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer);
};
PRInt32 RDFXMLDataSourceImpl::gRefCnt = 0;
@ -597,8 +601,8 @@ NS_IMPL_ISUPPORTS6(RDFXMLDataSourceImpl,
nsIStreamListener);
static nsresult
rdf_BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer)
nsresult
RDFXMLDataSourceImpl::BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer)
{
nsresult rv;
@ -626,6 +630,15 @@ rdf_BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer)
if (! proxy)
goto done;
// Notify load observers
PRInt32 i;
for (i = mObservers.Count() - 1; i >= 0; --i) {
nsIRDFXMLSinkObserver* obs =
NS_STATIC_CAST(nsIRDFXMLSinkObserver*, mObservers[i]);
obs->OnBeginLoad(this);
}
aConsumer->OnStartRequest(channel, nsnull);
while (PR_TRUE) {
char buf[1024];
@ -647,6 +660,17 @@ rdf_BlockingParse(nsIURI* aURL, nsIStreamListener* aConsumer)
aConsumer->OnStopRequest(channel, nsnull, rv, nsnull);
// Notify load observers
for (i = mObservers.Count() - 1; i >= 0; --i) {
nsIRDFXMLSinkObserver* obs =
NS_STATIC_CAST(nsIRDFXMLSinkObserver*, mObservers[i]);
if (NS_FAILED(rv))
obs->OnError(this, rv, nsnull);
obs->OnEndLoad(this);
}
// don't leak proxy!
proxy->Close();
delete proxy;
@ -953,7 +977,7 @@ RDFXMLDataSourceImpl::Refresh(PRBool aBlocking)
if (NS_FAILED(rv)) return rv;
if (aBlocking) {
rv = rdf_BlockingParse(mURL, this);
rv = BlockingParse(mURL, this);
mParser = nsnull; // release the parser
@ -979,7 +1003,9 @@ RDFXMLDataSourceImpl::BeginLoad(void)
mLoadState = eLoadState_Loading;
for (PRInt32 i = mObservers.Count() - 1; i >= 0; --i) {
nsIRDFXMLSinkObserver* obs = (nsIRDFXMLSinkObserver*) mObservers[i];
nsIRDFXMLSinkObserver* obs =
NS_STATIC_CAST(nsIRDFXMLSinkObserver*, mObservers[i]);
obs->OnBeginLoad(this);
}
return NS_OK;
@ -992,7 +1018,9 @@ RDFXMLDataSourceImpl::Interrupt(void)
("rdfxml[%p] interrupt(%s)", this, mURLSpec));
for (PRInt32 i = mObservers.Count() - 1; i >= 0; --i) {
nsIRDFXMLSinkObserver* obs = (nsIRDFXMLSinkObserver*) mObservers[i];
nsIRDFXMLSinkObserver* obs =
NS_STATIC_CAST(nsIRDFXMLSinkObserver*, mObservers[i]);
obs->OnInterrupt(this);
}
return NS_OK;
@ -1005,7 +1033,9 @@ RDFXMLDataSourceImpl::Resume(void)
("rdfxml[%p] resume(%s)", this, mURLSpec));
for (PRInt32 i = mObservers.Count() - 1; i >= 0; --i) {
nsIRDFXMLSinkObserver* obs = (nsIRDFXMLSinkObserver*) mObservers[i];
nsIRDFXMLSinkObserver* obs =
NS_STATIC_CAST(nsIRDFXMLSinkObserver*, mObservers[i]);
obs->OnResume(this);
}
return NS_OK;
@ -1027,7 +1057,9 @@ RDFXMLDataSourceImpl::EndLoad(void)
// Notify load observers
for (PRInt32 i = mObservers.Count() - 1; i >= 0; --i) {
nsIRDFXMLSinkObserver* obs = (nsIRDFXMLSinkObserver*) mObservers[i];
nsIRDFXMLSinkObserver* obs =
NS_STATIC_CAST(nsIRDFXMLSinkObserver*, mObservers[i]);
obs->OnEndLoad(this);
}
return NS_OK;
@ -1103,7 +1135,9 @@ RDFXMLDataSourceImpl::OnStopRequest(nsIChannel *channel,
{
if (NS_FAILED(status)) {
for (PRInt32 i = mObservers.Count() - 1; i >= 0; --i) {
nsIRDFXMLSinkObserver* obs = (nsIRDFXMLSinkObserver*) mObservers[i];
nsIRDFXMLSinkObserver* obs =
NS_STATIC_CAST(nsIRDFXMLSinkObserver*, mObservers[i]);
(void) obs->OnError(this, status, errorMsg);
}
}