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

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

Issue 325173002: ServiceWorker: Confirm the liveness of the associated context before handling message (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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_register_job.cc
diff --git a/content/browser/service_worker/service_worker_register_job.cc b/content/browser/service_worker/service_worker_register_job.cc
index dca493fb858277d1e7eb511a69236154601372b9..abf33921c762e29de163e286310372ad1d3f0784 100644
--- a/content/browser/service_worker/service_worker_register_job.cc
+++ b/content/browser/service_worker/service_worker_register_job.cc
@@ -9,6 +9,7 @@
#include "base/message_loop/message_loop.h"
#include "content/browser/service_worker/service_worker_context_core.h"
#include "content/browser/service_worker/service_worker_job_coordinator.h"
+#include "content/browser/service_worker/service_worker_provider_host_registry.h"
#include "content/browser/service_worker/service_worker_registration.h"
#include "content/browser/service_worker/service_worker_storage.h"
#include "content/browser/service_worker/service_worker_utils.h"
@@ -410,8 +411,8 @@ void ServiceWorkerRegisterJob::AssociateWaitingVersionToDocuments(
// TODO(michaeln): This needs to respect the longest prefix wins
// when it comes to finding a registration for a document url.
// This should utilize storage->FindRegistrationForDocument().
- for (scoped_ptr<ServiceWorkerContextCore::ProviderHostIterator> it =
- context->GetProviderHostIterator();
+ for (scoped_ptr<ServiceWorkerProviderHostRegistry::Iterator> it =
+ context->provider_registry()->GetProviderHostIterator();
!it->IsAtEnd();
it->Advance()) {
ServiceWorkerProviderHost* host = it->GetProviderHost();
@@ -427,8 +428,8 @@ void ServiceWorkerRegisterJob::DisassociateWaitingVersionFromDocuments(
base::WeakPtr<ServiceWorkerContextCore> context,
int64 version_id) {
DCHECK(context);
- for (scoped_ptr<ServiceWorkerContextCore::ProviderHostIterator> it =
- context->GetProviderHostIterator();
+ for (scoped_ptr<ServiceWorkerProviderHostRegistry::Iterator> it =
+ context->provider_registry()->GetProviderHostIterator();
!it->IsAtEnd();
it->Advance()) {
ServiceWorkerProviderHost* host = it->GetProviderHost();

Powered by Google App Engine
This is Rietveld 408576698