content/browser/worker_host/worker_process_host.cc - Issue 115713004: Move the worker script loading code to the worker process (phase:2/5)

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/worker_host/worker_process_host.cc

Issue 115713004: Move the worker script loading code to the worker process (phase:2/5) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Stop using forward reference to enum type. Created 6 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

« no previous file with comments | « content/browser/worker_host/worker_process_host.h ('k') | content/browser/worker_host/worker_service_impl.cc » ('j') | content/common/worker_messages.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/worker_host/worker_process_host.cc

diff --git a/content/browser/worker_host/worker_process_host.cc b/content/browser/worker_host/worker_process_host.cc

index 71a7007fff75fa5bda7f643b7bb457c2b7a417e4..9b95d4dd09e78cb6eed6de0940242ddbfc83ed3b 100644

--- a/content/browser/worker_host/worker_process_host.cc

+++ b/content/browser/worker_host/worker_process_host.cc

@@ -282,6 +282,8 @@ void WorkerProcessHost::CreateWorker(const WorkerInstance& instance) {

WorkerProcessMsg_CreateWorker_Params params;

params.url = instance.url();

params.name = instance.name();

+ params.content_security_policy = instance.content_security_policy();

+ params.security_policy_type = instance.security_policy_type();

params.route_id = instance.worker_route_id();

params.creator_process_id = instance.parent_process_id();

params.shared_worker_appcache_id = instance.main_resource_appcache_id();

@@ -577,6 +579,8 @@ net::URLRequestContext* WorkerProcessHost::GetRequestContext(

WorkerProcessHost::WorkerInstance::WorkerInstance(

const GURL& url,

const base::string16& name,

+ const base::string16& content_security_policy,

+ blink::WebContentSecurityPolicyType security_policy_type,

int worker_route_id,

int parent_process_id,

int64 main_resource_appcache_id,

@@ -585,6 +589,8 @@ WorkerProcessHost::WorkerInstance::WorkerInstance(

: url_(url),

closed_(false),

name_(name),

+ content_security_policy_(content_security_policy),

+ security_policy_type_(security_policy_type),

worker_route_id_(worker_route_id),

parent_process_id_(parent_process_id),

main_resource_appcache_id_(main_resource_appcache_id),