Index: content/renderer/websharedworker_proxy.cc |
=================================================================== |
--- content/renderer/websharedworker_proxy.cc (revision 116764) |
+++ content/renderer/websharedworker_proxy.cc (working copy) |
@@ -45,13 +45,16 @@ |
route_id_ = MSG_ROUTING_NONE; |
} |
-void WebSharedWorkerProxy::CreateWorkerContext(const GURL& script_url, |
- bool is_shared, |
- const string16& name, |
- const string16& user_agent, |
- const string16& source_code, |
- int pending_route_id, |
- int64 script_resource_appcache_id) { |
+void WebSharedWorkerProxy::CreateWorkerContext( |
+ const GURL& script_url, |
+ bool is_shared, |
+ const string16& name, |
+ const string16& user_agent, |
+ const string16& source_code, |
+ const string16& content_security_policy, |
+ bool report_only, |
+ int pending_route_id, |
+ int64 script_resource_appcache_id) { |
DCHECK(route_id_ == MSG_ROUTING_NONE); |
ViewHostMsg_CreateWorker_Params params; |
params.url = script_url; |
@@ -72,7 +75,8 @@ |
// connect might have already been called. |
queued_messages_.insert(queued_messages_.begin(), |
new WorkerMsg_StartWorkerContext( |
- route_id_, script_url, user_agent, source_code)); |
+ route_id_, script_url, user_agent, source_code, |
+ content_security_policy, report_only)); |
} |
bool WebSharedWorkerProxy::IsStarted() { |
@@ -121,6 +125,21 @@ |
long long script_resource_appcache_id) { |
DCHECK(!isStarted()); |
CreateWorkerContext(script_url, true, name, user_agent, source_code, |
+ string16(), false, pending_route_id_, |
+ script_resource_appcache_id); |
+} |
+ |
+void WebSharedWorkerProxy::startWorkerContext( |
+ const WebKit::WebURL& script_url, |
+ const WebKit::WebString& name, |
+ const WebKit::WebString& user_agent, |
+ const WebKit::WebString& source_code, |
+ const WebKit::WebString& content_security_policy, |
+ bool report_only, |
+ long long script_resource_appcache_id) { |
+ DCHECK(!isStarted()); |
+ CreateWorkerContext(script_url, true, name, user_agent, source_code, |
+ content_security_policy, report_only, |
pending_route_id_, script_resource_appcache_id); |
} |