From 9671270568580baa03501b2194f2d84bb2cbb691 Mon Sep 17 00:00:00 2001 From: "mscott%netscape.com" Date: Tue, 18 Apr 2000 21:39:09 +0000 Subject: [PATCH] Bug #36221 --> throbber never stops when loading a frameset doc. I was signaling the stop notification via a OnchildStatus in this scenario. We should always signal the start and stop of documents as a status change even if a child is originating the change. --- uriloader/base/nsDocLoader.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/uriloader/base/nsDocLoader.cpp b/uriloader/base/nsDocLoader.cpp index 056e8278f960..2b404fafe82b 100644 --- a/uriloader/base/nsDocLoader.cpp +++ b/uriloader/base/nsDocLoader.cpp @@ -545,11 +545,7 @@ void nsDocLoaderImpl::FireOnStartDocumentLoad(nsDocLoaderImpl* aLoadInitiator, if (mProgressListener) { mProgressStatusFlags = nsIWebProgress::flag_net_start; - - if (aLoadInitiator == this) - mProgressListener->OnStatusChange(mDocumentChannel, mProgressStatusFlags); - else // the load must be initiated by a child...mscott: I'm passing the WRONG channel here! I need to add a get channel to the doc loader interface - mProgressListener->OnChildStatusChange(mDocumentChannel, mProgressStatusFlags); + mProgressListener->OnStatusChange(mDocumentChannel, mProgressStatusFlags); } /* @@ -615,11 +611,7 @@ void nsDocLoaderImpl::FireOnEndDocumentLoad(nsDocLoaderImpl* aLoadInitiator, if (mProgressListener) { mProgressStatusFlags = nsIWebProgress::flag_net_stop; - - if (aLoadInitiator == this) - mProgressListener->OnStatusChange(aDocChannel, mProgressStatusFlags); - else // the load must be initiated by a child...mscott: I'm passing the WRONG channel here! I need to add a get channel to the doc loader interface - mProgressListener->OnChildStatusChange(aDocChannel, mProgressStatusFlags); + mProgressListener->OnStatusChange(aDocChannel, mProgressStatusFlags); }