corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 782594 - Make some methods in uriloader/ infallible; r=bz

Browse Source
This commit is contained in:
Aryeh Gregor
2012-08-14 12:10:42 +03:00
parent 4993674349
commit 8d37239f5b
4 changed files with 17 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
uriloader/prefetch/nsOfflineCacheUpdate.cpp
View File

@@ -1528,8 +1528,7 @@ nsOfflineCacheUpdate::LoadCompleted(nsOfflineCacheUpdateItem *aItem)
return;
}
rv = NotifyState(nsIOfflineCacheUpdateObserver::STATE_ITEMCOMPLETED);
if (NS_FAILED(rv)) return;
NotifyState(nsIOfflineCacheUpdateObserver::STATE_ITEMCOMPLETED);
ProcessNextURI();
}
@@ -1774,7 +1773,7 @@ nsOfflineCacheUpdate::ProcessNextURI()
return NS_DispatchToCurrentThread(this);
}
nsresult
void
nsOfflineCacheUpdate::GatherObservers(nsCOMArray<nsIOfflineCacheUpdateObserver> &aObservers)
{
for (int32_t i = 0; i < mWeakObservers.Count(); i++) {
@@ -1789,38 +1788,30 @@ nsOfflineCacheUpdate::GatherObservers(nsCOMArray<nsIOfflineCacheUpdateObserver>
for (int32_t i = 0; i < mObservers.Count(); i++) {
aObservers.AppendObject(mObservers[i]);
}
return NS_OK;
}
nsresult
void
nsOfflineCacheUpdate::NotifyState(uint32_t state)
{
LOG(("nsOfflineCacheUpdate::NotifyState [%p, %d]", this, state));
nsCOMArray<nsIOfflineCacheUpdateObserver> observers;
nsresult rv = GatherObservers(observers);
NS_ENSURE_SUCCESS(rv, rv);
GatherObservers(observers);
for (int32_t i = 0; i < observers.Count(); i++) {
observers[i]->UpdateStateChanged(this, state);
}
return NS_OK;
}
nsresult
void
nsOfflineCacheUpdate::AssociateDocuments(nsIApplicationCache* cache)
{
nsCOMArray<nsIOfflineCacheUpdateObserver> observers;
nsresult rv = GatherObservers(observers);
NS_ENSURE_SUCCESS(rv, rv);
GatherObservers(observers);
for (int32_t i = 0; i < observers.Count(); i++) {
observers[i]->ApplicationCacheAvailable(cache);
}
return NS_OK;
}
void
@@ -2235,17 +2226,18 @@ nsOfflineCacheUpdate::UpdateStateChanged(nsIOfflineCacheUpdate *aUpdate,
mSucceeded = succeeded;
}
nsresult rv = NotifyState(aState);
NotifyState(aState);
if (aState == nsIOfflineCacheUpdateObserver::STATE_FINISHED)
aUpdate->RemoveObserver(this);
return rv;
return NS_OK;
}
NS_IMETHODIMP
nsOfflineCacheUpdate::ApplicationCacheAvailable(nsIApplicationCache *applicationCache)
{
return AssociateDocuments(applicationCache);
AssociateDocuments(applicationCache);
return NS_OK;
}
//-----------------------------------------------------------------------------