Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 08:12:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

24250. r=gordon,mscott,warren. We now ensure that a cache entry adds itself to the loadgroup *before* the load group goes away. This allows the editor to 'Edit Page's again.

Browse Source
This commit is contained in:
valeski%netscape.com 2000-01-21 23:58:29 +00:00
parent 5439dac668
commit 09d0af3430
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
netwerk/cache/mgr/nsCacheEntryChannel.cpp vendored
View File

@ -121,12 +121,22 @@ class CacheManagerStreamListener: public nsIStreamListener {
public:
CacheManagerStreamListener(nsIStreamListener *aListener,
nsILoadGroup *aLoadGroup, nsIChannel *aChannel):
mListener(aListener), mLoadGroup(aLoadGroup), mChannel(aChannel)
CacheManagerStreamListener()
{ NS_INIT_REFCNT(); }
virtual ~CacheManagerStreamListener() {}
nsresult Init(nsIStreamListener *aListener, nsILoadGroup *aLoadGroup,
nsIChannel *aChannel, nsISupports *aContext)
{
nsresult rv = NS_OK;
mListener = aListener;
mLoadGroup = aLoadGroup;
mChannel = aChannel;
if (!mListener || !mLoadGroup || !mChannel) return NS_ERROR_NOT_INITIALIZED;
return mLoadGroup->AddChannel(mChannel, aContext);
}
private:
@ -140,8 +150,6 @@ class CacheManagerStreamListener: public nsIStreamListener {
NS_IMETHOD
OnStartRequest(nsIChannel *channel, nsISupports *aContext) {
if (mLoadGroup)
mLoadGroup->AddChannel(mChannel, aContext);
return mListener->OnStartRequest(mChannel, aContext);
}
@ -192,9 +200,14 @@ nsCacheEntryChannel::AsyncRead(PRUint32 aStartPosition, PRInt32 aReadCount,
nsIChannel *channelForListener;
channelForListener = mProxyChannel ? mProxyChannel.get() : NS_STATIC_CAST(nsIChannel*, this);
cacheManagerStreamListener =
new CacheManagerStreamListener(headListener, mLoadGroup, channelForListener);
cacheManagerStreamListener = new CacheManagerStreamListener();
if (!cacheManagerStreamListener) return NS_ERROR_OUT_OF_MEMORY;
rv = cacheManagerStreamListener->Init(headListener, mLoadGroup, channelForListener, aContext);
if (NS_FAILED(rv)) {
delete cacheManagerStreamListener;
return rv;
}
NS_ADDREF(cacheManagerStreamListener);
rv = mChannel->AsyncRead(aStartPosition, aReadCount, aContext,