nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 486470. Keep ref to offline cache update until end of lifetime. r=honzab, sr=vlad

Browse source
This commit is contained in:
Dave Camp 2009-04-14 15:09:23 +09:00
parent dff92ac06b
commit 5a9afe7d24
1 changed files with 15 additions and 7 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

22
uriloader/prefetch/nsOfflineCacheUpdate.cpp
View file

@ -1329,6 +1329,9 @@ nsOfflineCacheUpdate::LoadCompleted()
{
nsresult rv;
// Keep the object alive through a Finish() call.
nsCOMPtr<nsIOfflineCacheUpdate> kungFuDeathGrip(this);
LOG(("nsOfflineCacheUpdate::LoadCompleted [%p]", this));
if (mState == STATE_CANCELLED) {
@ -1442,6 +1445,9 @@ void
nsOfflineCacheUpdate::ManifestCheckCompleted(nsresult aStatus,
const nsCString &aManifestHash)
{
// Keep the object alive through a Finish() call.
nsCOMPtr<nsIOfflineCacheUpdate> kungFuDeathGrip(this);
if (NS_SUCCEEDED(aStatus)) {
nsCAutoString firstManifestHash;
mManifestItem->GetManifestHash(firstManifestHash);
@ -1477,6 +1483,9 @@ nsOfflineCacheUpdate::Begin()
{
LOG(("nsOfflineCacheUpdate::Begin [%p]", this));
// Keep the object alive through a ProcessNextURI()/Finish() call.
nsCOMPtr<nsIOfflineCacheUpdate> kungFuDeathGrip(this);
mCurrentItem = 0;
if (mPartialUpdate) {
@ -1576,6 +1585,9 @@ nsOfflineCacheUpdate::AddExistingItems(PRUint32 aType,
nsresult
nsOfflineCacheUpdate::ProcessNextURI()
{
// Keep the object alive through a Finish() call.
nsCOMPtr<nsIOfflineCacheUpdate> kungFuDeathGrip(this);
LOG(("nsOfflineCacheUpdate::ProcessNextURI [%p, current=%d, numItems=%d]",
this, mCurrentItem, mItems.Length()));
@ -1793,6 +1805,9 @@ nsOfflineCacheUpdate::SetOwner(nsOfflineCacheUpdateOwner *aOwner)
nsresult
nsOfflineCacheUpdate::UpdateFinished(nsOfflineCacheUpdate *aUpdate)
{
// Keep the object alive through a Finish() call.
nsCOMPtr<nsIOfflineCacheUpdate> kungFuDeathGrip(this);
mImplicitUpdate = nsnull;
NotifyNoUpdate();
@ -1909,13 +1924,6 @@ nsOfflineCacheUpdate::Finish()
{
LOG(("nsOfflineCacheUpdate::Finish [%p]", this));
// Because the call to UpdateFinished(this) at the end of this method
// may relese the last reference to this object but we still want to work
// with it after Finish() call ended, make sure to release this instance in
// the next thread loop round.
NS_ADDREF_THIS();
NS_ProxyRelease(NS_GetCurrentThread(), this, PR_TRUE);
mState = STATE_FINISHED;
if (!mPartialUpdate) {