| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 | 32 |
| 33 #include "DedicatedWorkerContext.h" | 33 #include "core/workers/DedicatedWorkerContext.h" |
| 34 | 34 |
| 35 #include "DedicatedWorkerThread.h" | |
| 36 #include "WorkerObjectProxy.h" | |
| 37 #include "core/dom/MessageEvent.h" | 35 #include "core/dom/MessageEvent.h" |
| 38 #include "core/page/DOMWindow.h" | 36 #include "core/page/DOMWindow.h" |
| 37 #include "core/workers/DedicatedWorkerThread.h" |
| 38 #include "core/workers/WorkerObjectProxy.h" |
| 39 | 39 |
| 40 namespace WebCore { | 40 namespace WebCore { |
| 41 | 41 |
| 42 PassRefPtr<DedicatedWorkerContext> DedicatedWorkerContext::create(const KURL& ur
l, const String& userAgent, PassOwnPtr<GroupSettings> settings, DedicatedWorkerT
hread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::Heade
rType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin) | 42 PassRefPtr<DedicatedWorkerContext> DedicatedWorkerContext::create(const KURL& ur
l, const String& userAgent, PassOwnPtr<GroupSettings> settings, DedicatedWorkerT
hread* thread, const String& contentSecurityPolicy, ContentSecurityPolicy::Heade
rType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topOrigin) |
| 43 { | 43 { |
| 44 RefPtr<DedicatedWorkerContext> context = adoptRef(new DedicatedWorkerContext
(url, userAgent, settings, thread, topOrigin)); | 44 RefPtr<DedicatedWorkerContext> context = adoptRef(new DedicatedWorkerContext
(url, userAgent, settings, thread, topOrigin)); |
| 45 context->applyContentSecurityPolicyFromString(contentSecurityPolicy, content
SecurityPolicyType); | 45 context->applyContentSecurityPolicyFromString(contentSecurityPolicy, content
SecurityPolicyType); |
| 46 return context.release(); | 46 return context.release(); |
| 47 } | 47 } |
| 48 | 48 |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 Base::importScripts(urls, ec); | 82 Base::importScripts(urls, ec); |
| 83 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); | 83 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); |
| 84 } | 84 } |
| 85 | 85 |
| 86 DedicatedWorkerThread* DedicatedWorkerContext::thread() | 86 DedicatedWorkerThread* DedicatedWorkerContext::thread() |
| 87 { | 87 { |
| 88 return static_cast<DedicatedWorkerThread*>(Base::thread()); | 88 return static_cast<DedicatedWorkerThread*>(Base::thread()); |
| 89 } | 89 } |
| 90 | 90 |
| 91 } // namespace WebCore | 91 } // namespace WebCore |
| OLD | NEW |