Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(322)

Unified Diff: content/browser/service_worker/service_worker_registration.cc

Issue 871853002: ServiceWorker: add ServiceWorkerClients.claim() support (2/3). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: remove listener Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/service_worker/service_worker_registration.cc
diff --git a/content/browser/service_worker/service_worker_registration.cc b/content/browser/service_worker/service_worker_registration.cc
index a4fac5c65873a9c9afe96c3b0e8b6fa92fe493b0..275747c31ded7956b37957a5169ff7d82fd16c8a 100644
--- a/content/browser/service_worker/service_worker_registration.cc
+++ b/content/browser/service_worker/service_worker_registration.cc
@@ -161,6 +161,31 @@ void ServiceWorkerRegistration::ActivateWaitingVersionWhenReady() {
ActivateWaitingVersion();
}
+void ServiceWorkerRegistration::ClaimClients() {
+ DCHECK(context_);
+ DCHECK(active_version());
+ // Live registrations contains longest matched registrations in database
+ // and new registrations on the fly. So we can just check these living ones.
falken 2015/01/29 15:10:37 Maybe more clear to say: "It's sufficient to only
michaeln 2015/01/29 22:35:34 Not so sure about this comment? I think its incorr
+ std::vector<ServiceWorkerRegistrationInfo> infos =
+ context_->GetAllLiveRegistrationInfo();
+ for (scoped_ptr<ServiceWorkerContextCore::ProviderHostIterator> it =
+ context_->GetProviderHostIterator();
+ !it->IsAtEnd(); it->Advance()) {
+ ServiceWorkerProviderHost* host = it->GetProviderHost();
+ if (!ShouldClaim(host, infos))
+ continue;
+ if (host->associated_registration() == this) {
+ host->ClaimedByNewVersion();
+ continue;
+ }
+ host->DisassociateRegistration();
falken 2015/01/29 15:10:37 It seems strange to preemptively Disassociate and
michaeln 2015/01/29 22:35:34 Agreed, the most direct thing to do might be to ad
+ // There will still chance that a new registration triggers claim
+ // while a navigation is happening.
falken 2015/01/29 15:10:37 I'm not sure what this comment is intended to be a
+ if (host->CanAssociateRegistration(this))
+ host->AssociateRegistration(this);
+ }
+}
+
void ServiceWorkerRegistration::ClearWhenReady() {
DCHECK(context_);
if (is_uninstalling_)
@@ -360,4 +385,31 @@ void ServiceWorkerRegistration::OnRestoreFinished(
callback.Run(status);
}
+bool ServiceWorkerRegistration::ShouldClaim(
+ ServiceWorkerProviderHost* provider_host,
+ std::vector<ServiceWorkerRegistrationInfo>& registration_infos) {
+ if (!ServiceWorkerUtils::ScopeMatches(
+ pattern_, provider_host->document_url()))
+ return false;
+
+ LongestScopeMatcher matcher(provider_host->document_url());
+ int64 match = kInvalidServiceWorkerRegistrationId;
+ for (std::vector<ServiceWorkerRegistrationInfo>::iterator it =
+ registration_infos.begin();
+ it != registration_infos.end(); ++it) {
+ ServiceWorkerRegistration* registration =
+ context_->GetLiveRegistration(it->registration_id);
+ if (!registration || registration->is_uninstalled())
michaeln 2015/01/29 22:35:34 I think FindRegistrationForDocument would return '
xiang 2015/01/30 07:18:57 Yes, I think so, the spec defined this behavior.
+ continue;
+ if (matcher.MatchLongest(it->pattern))
+ match = it->registration_id;
+ }
+
+ if (match != registration_id_)
+ return false;
+ if (provider_host->controlling_version() == active_version())
+ return false;
falken 2015/01/29 15:10:37 small optimization: we could move this check to th
michaeln 2015/01/29 22:35:34 another small opt: seed the matcher with the match
xiang 2015/01/30 07:18:57 Done.
+ return true;
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698