summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/websharedworker_stub.cc7
-rw-r--r--content/worker/websharedworker_stub.h6
2 files changed, 10 insertions, 3 deletions
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc
index 8b29305..28347ea 100644
--- a/content/worker/websharedworker_stub.cc
+++ b/content/worker/websharedworker_stub.cc
@@ -81,13 +81,16 @@ const GURL& WebSharedWorkerStub::url() {
}
void WebSharedWorkerStub::OnStartWorkerContext(
- const GURL& url, const string16& user_agent, const string16& source_code) {
+ const GURL& url, const string16& user_agent, const string16& source_code,
+ const string16& content_security_policy,
+ WebKit::WebContentSecurityPolicyType policy_type) {
// Ignore multiple attempts to start this worker (can happen if two pages
// try to start it simultaneously).
if (started_)
return;
- impl_->startWorkerContext(url, name_, user_agent, source_code, 0);
+ impl_->startWorkerContext(url, name_, user_agent, source_code,
+ content_security_policy, policy_type, 0);
started_ = true;
url_ = url;
diff --git a/content/worker/websharedworker_stub.h b/content/worker/websharedworker_stub.h
index 4ffe2a0..7caf545 100644
--- a/content/worker/websharedworker_stub.h
+++ b/content/worker/websharedworker_stub.h
@@ -11,6 +11,7 @@
#include "content/worker/worker_webapplicationcachehost_impl.h"
#include "googleurl/src/gurl.h"
#include "ipc/ipc_channel.h"
+#include "third_party/WebKit/Source/WebKit/chromium/public/WebSharedWorker.h"
namespace WebKit {
class WebSharedWorker;
@@ -51,7 +52,10 @@ class WebSharedWorkerStub : public IPC::Channel::Listener {
void OnConnect(int sent_message_port_id, int routing_id);
void OnStartWorkerContext(
- const GURL& url, const string16& user_agent, const string16& source_code);
+ const GURL& url, const string16& user_agent, const string16& source_code,
+ const string16& content_security_policy,
+ WebKit::WebContentSecurityPolicyType policy_type);
+
void OnTerminateWorkerContext();
int route_id_;