| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "content/renderer/shared_worker_repository.h" | 5 #include "content/renderer/shared_worker_repository.h" |
| 6 | 6 |
| 7 #include "content/child/child_thread_impl.h" | 7 #include "content/child/child_thread_impl.h" |
| 8 #include "content/common/view_messages.h" | 8 #include "content/common/view_messages.h" |
| 9 #include "content/renderer/render_frame_impl.h" | 9 #include "content/renderer/render_frame_impl.h" |
| 10 #include "content/renderer/websharedworker_proxy.h" | 10 #include "content/renderer/websharedworker_proxy.h" |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 const blink::WebURL& url, | 25 const blink::WebURL& url, |
| 26 const blink::WebString& name, | 26 const blink::WebString& name, |
| 27 DocumentID document_id, | 27 DocumentID document_id, |
| 28 const blink::WebString& content_security_policy, | 28 const blink::WebString& content_security_policy, |
| 29 blink::WebContentSecurityPolicyType security_policy_type, | 29 blink::WebContentSecurityPolicyType security_policy_type, |
| 30 blink::WebAddressSpace creation_address_space, | 30 blink::WebAddressSpace creation_address_space, |
| 31 blink::WebSharedWorkerCreationContextType creation_context_type, | 31 blink::WebSharedWorkerCreationContextType creation_context_type, |
| 32 blink::WebWorkerCreationError* error) { | 32 blink::WebWorkerCreationError* error) { |
| 33 ViewHostMsg_CreateWorker_Params params; | 33 ViewHostMsg_CreateWorker_Params params; |
| 34 params.url = url; | 34 params.url = url; |
| 35 params.name = name; | 35 params.name = name.utf16(); |
| 36 params.content_security_policy = content_security_policy; | 36 params.content_security_policy = content_security_policy.utf16(); |
| 37 params.security_policy_type = security_policy_type; | 37 params.security_policy_type = security_policy_type; |
| 38 params.document_id = document_id; | 38 params.document_id = document_id; |
| 39 params.render_frame_route_id = render_frame()->GetRoutingID(); | 39 params.render_frame_route_id = render_frame()->GetRoutingID(); |
| 40 params.creation_address_space = creation_address_space; | 40 params.creation_address_space = creation_address_space; |
| 41 params.creation_context_type = creation_context_type; | 41 params.creation_context_type = creation_context_type; |
| 42 ViewHostMsg_CreateWorker_Reply reply; | 42 ViewHostMsg_CreateWorker_Reply reply; |
| 43 Send(new ViewHostMsg_CreateWorker(params, &reply)); | 43 Send(new ViewHostMsg_CreateWorker(params, &reply)); |
| 44 *error = reply.error; | 44 *error = reply.error; |
| 45 if (reply.route_id == MSG_ROUTING_NONE) { | 45 if (reply.route_id == MSG_ROUTING_NONE) { |
| 46 return NULL; | 46 return NULL; |
| (...skipping 10 matching lines...) Expand all Loading... |
| 57 Send(new ViewHostMsg_DocumentDetached(document)); | 57 Send(new ViewHostMsg_DocumentDetached(document)); |
| 58 documents_with_workers_.erase(iter); | 58 documents_with_workers_.erase(iter); |
| 59 } | 59 } |
| 60 } | 60 } |
| 61 | 61 |
| 62 void SharedWorkerRepository::OnDestruct() { | 62 void SharedWorkerRepository::OnDestruct() { |
| 63 delete this; | 63 delete this; |
| 64 } | 64 } |
| 65 | 65 |
| 66 } // namespace content | 66 } // namespace content |
| OLD | NEW |