summaryrefslogtreecommitdiffstats
path: root/content/worker
diff options
context:
space:
mode:
authortsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-09 23:47:56 +0000
committertsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-09 23:47:56 +0000
commit5bead4818d6bf5bfb9d75f943f2312ea20d7d944 (patch)
treee6de369dca9abf255f0302fcf871d85c94978bbd /content/worker
parent9909d773bbc40cbcad3d7ddb4517bcecf08df52e (diff)
downloadchromium_src-5bead4818d6bf5bfb9d75f943f2312ea20d7d944.zip
chromium_src-5bead4818d6bf5bfb9d75f943f2312ea20d7d944.tar.gz
chromium_src-5bead4818d6bf5bfb9d75f943f2312ea20d7d944.tar.bz2
Pass Content-security-policy and header type from WebSharedWorkerProxy to WebSharedWorkerStub.
BUG=105482 Review URL: http://codereview.chromium.org/9154003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
-rw-r--r--content/worker/websharedworker_stub.cc6
-rw-r--r--content/worker/websharedworker_stub.h6
2 files changed, 8 insertions, 4 deletions
diff --git a/content/worker/websharedworker_stub.cc b/content/worker/websharedworker_stub.cc
index 8b29305..69fa613 100644
--- a/content/worker/websharedworker_stub.cc
+++ b/content/worker/websharedworker_stub.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -81,12 +81,14 @@ 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 */, bool /* report_only */) {
// Ignore multiple attempts to start this worker (can happen if two pages
// try to start it simultaneously).
if (started_)
return;
+ // TODO(tsepez): pass CSP info into worker once webkit interface updated.
impl_->startWorkerContext(url, name_, user_agent, source_code, 0);
started_ = true;
url_ = url;
diff --git a/content/worker/websharedworker_stub.h b/content/worker/websharedworker_stub.h
index 4ffe2a0..b2e8344 100644
--- a/content/worker/websharedworker_stub.h
+++ b/content/worker/websharedworker_stub.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -51,7 +51,9 @@ 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, bool report_only);
+
void OnTerminateWorkerContext();
int route_id_;