summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--content/browser/service_worker/service_worker_storage.cc15
1 files changed, 10 insertions, 5 deletions
diff --git a/content/browser/service_worker/service_worker_storage.cc b/content/browser/service_worker/service_worker_storage.cc
index eea2a43..8a924e0 100644
--- a/content/browser/service_worker/service_worker_storage.cc
+++ b/content/browser/service_worker/service_worker_storage.cc
@@ -593,13 +593,18 @@ void ServiceWorkerStorage::DidGetAllRegistrations(
info.active_version = version->GetInfo();
else
info.waiting_version = version->GetInfo();
- } else {
+ infos.push_back(info);
+ continue;
+ }
+
+ if (it->is_active) {
info.active_version.is_null = false;
- if (it->is_active)
- info.active_version.status = ServiceWorkerVersion::ACTIVE;
- else
- info.active_version.status = ServiceWorkerVersion::INSTALLED;
+ info.active_version.status = ServiceWorkerVersion::ACTIVE;
info.active_version.version_id = it->version_id;
+ } else {
+ info.waiting_version.is_null = false;
+ info.waiting_version.status = ServiceWorkerVersion::INSTALLED;
+ info.waiting_version.version_id = it->version_id;
}
infos.push_back(info);
}