content/browser/service_worker/service_worker_context_core.cc - Issue 2055433002: Revert of service worker: Don't control a subframe of an insecure context

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_context_core.cc

Issue 2055433002: Revert of service worker: Don't control a subframe of an insecure context (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 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_browsertest.cc ('k') | content/browser/service_worker/service_worker_context_request_handler_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/service_worker/service_worker_context_core.cc

diff --git a/content/browser/service_worker/service_worker_context_core.cc b/content/browser/service_worker/service_worker_context_core.cc

index 5afed8a7c8dcef484ef12a6a3fece1e08a57702c..704f821d151d6b7c874d6452728743f0b82973a6 100644

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

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

@@ -631,13 +631,13 @@

int provider_id) {

ProviderMap* map = GetProviderMapForProcess(process_id);

ServiceWorkerProviderHost* transferee = map->Lookup(provider_id);

- ServiceWorkerProviderHost* replacement = new ServiceWorkerProviderHost(

- process_id, transferee->frame_id(), provider_id,

- transferee->provider_type(),

- transferee->is_parent_frame_secure()

- ? ServiceWorkerProviderHost::FrameSecurityLevel::SECURE

- : ServiceWorkerProviderHost::FrameSecurityLevel::INSECURE,

- AsWeakPtr(), transferee->dispatcher_host());

+ ServiceWorkerProviderHost* replacement =

+ new ServiceWorkerProviderHost(process_id,

+ transferee->frame_id(),

+ provider_id,

+ transferee->provider_type(),

+ AsWeakPtr(),

+ transferee->dispatcher_host());

map->Replace(provider_id, replacement);

transferee->PrepareForCrossSiteTransfer();

return base::WrapUnique(transferee);