Bug 1130570 - Ensure we have a valid runtime service, and clear updating scopes on early return. r=baku

--HG--
extra : rebase_source : 0274f76d6a89eca902a52fe5dbc7e431f9e9737d
This commit is contained in:
Nikhil Marathe 2015-02-11 13:24:57 -08:00
parent fc8ee86cf3
commit 50c91da5cb

View File

@ -567,6 +567,7 @@ public:
getter_AddRefs(serviceWorker));
if (NS_WARN_IF(NS_FAILED(rv))) {
swm->mSetOfScopesBeingUpdated.Remove(mRegistration->mScope);
Fail(NS_ERROR_DOM_ABORT_ERR);
return rv;
}
@ -581,6 +582,7 @@ public:
jsapi.Init();
bool ok = r->Dispatch(jsapi.cx());
if (NS_WARN_IF(!ok)) {
swm->mSetOfScopesBeingUpdated.Remove(mRegistration->mScope);
Fail(NS_ERROR_DOM_ABORT_ERR);
return rv;
}