diff options
| author | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 18:15:57 +0000 |
|---|---|---|
| committer | tsepez@chromium.org <tsepez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-23 18:15:57 +0000 |
| commit | 9d7e332037313bc5a1088a355c4a321a415de305 (patch) | |
| tree | e1af0271900ed44f46460f75a9f8663c02637d6a /content/worker | |
| parent | 1efbb9b5dce977e101225c3bb3985d11804816c8 (diff) | |
| download | chromium_src-9d7e332037313bc5a1088a355c4a321a415de305.zip chromium_src-9d7e332037313bc5a1088a355c4a321a415de305.tar.gz chromium_src-9d7e332037313bc5a1088a355c4a321a415de305.tar.bz2 | |
Pass Content-security-policy and header type from WebSharedWorkerProxy to WebSharedWorkerStub now that webkit is updated.
Step #2 of https://bugs.webkit.org/show_bug.cgi?id=75660#c15
BUG=105482
Review URL: https://chromiumcodereview.appspot.com/9154003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/worker')
| -rw-r--r-- | content/worker/websharedworker_stub.cc | 7 | ||||
| -rw-r--r-- | content/worker/websharedworker_stub.h | 6 |
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_; |