content/browser/service_worker/service_worker_register_job.cc - Issue 325173002: ServiceWorker: Confirm the liveness of the associated context before handling message

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: fix more 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

« no previous file with comments | « content/browser/service_worker/service_worker_provider_host.cc ('k') | content/browser/service_worker/service_worker_request_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 5948dcf29240136025ce32bccbc1f7708bde7b18..6eba2e8ab82a714235f7a0b97f6822f8e3f089cd 100644

--- a/content/browser/service_worker/service_worker_register_job.cc

+++ b/content/browser/service_worker/service_worker_register_job.cc

@@ -412,6 +412,8 @@ void ServiceWorkerRegisterJob::AssociateWaitingVersionToDocuments(

!it->IsAtEnd();

it->Advance()) {

ServiceWorkerProviderHost* host = it->GetProviderHost();

+ if (!host->IsContextAlive())

+ continue;

if (ServiceWorkerUtils::ScopeMatches(version->scope(),

host->document_url())) {

// The spec's _Update algorithm says, "upgrades active version to a new

@@ -440,6 +442,8 @@ void ServiceWorkerRegisterJob::DisassociateWaitingVersionFromDocuments(

!it->IsAtEnd();

it->Advance()) {

ServiceWorkerProviderHost* host = it->GetProviderHost();

+ if (!host->IsContextAlive())

+ continue;

if (host->waiting_version() &&

host->waiting_version()->version_id() == version_id) {

host->SetWaitingVersion(NULL);