Commit 1c60ec33 authored by horo@chromium.org's avatar horo@chromium.org

Fills the info about the live versions which aren't in the live registrations.

BUG=358657

Review URL: https://codereview.chromium.org/307223003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274501 0039d316-1c4b-4281-b951-d872f2087c98
parent 13c26505
...@@ -580,12 +580,20 @@ void ServiceWorkerStorage::DidGetAllRegistrations( ...@@ -580,12 +580,20 @@ void ServiceWorkerStorage::DidGetAllRegistrations(
info.pattern = it->scope; info.pattern = it->scope;
info.script_url = it->script; info.script_url = it->script;
info.registration_id = it->registration_id; info.registration_id = it->registration_id;
info.active_version.is_null = false; if (ServiceWorkerVersion* version =
if (it->is_active) context_->GetLiveVersion(it->version_id)) {
info.active_version.status = ServiceWorkerVersion::ACTIVE; if (it->is_active)
else info.active_version = version->GetInfo();
info.active_version.status = ServiceWorkerVersion::INSTALLED; else
info.active_version.version_id = it->version_id; info.pending_version = version->GetInfo();
} else {
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.version_id = it->version_id;
}
infos.push_back(info); infos.push_back(info);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment