| 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 "core/workers/DedicatedWorkerContext.h" | 33 #include "core/workers/DedicatedWorkerGlobalScope.h" |
| 34 | 34 |
| 35 #include "core/page/DOMWindow.h" | 35 #include "core/page/DOMWindow.h" |
| 36 #include "core/workers/DedicatedWorkerThread.h" | 36 #include "core/workers/DedicatedWorkerThread.h" |
| 37 #include "core/workers/WorkerObjectProxy.h" | 37 #include "core/workers/WorkerObjectProxy.h" |
| 38 | 38 |
| 39 namespace WebCore { | 39 namespace WebCore { |
| 40 | 40 |
| 41 PassRefPtr<DedicatedWorkerContext> DedicatedWorkerContext::create(const KURL& ur
l, const String& userAgent, DedicatedWorkerThread* thread, const String& content
SecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType, Pas
sRefPtr<SecurityOrigin> topOrigin, double timeOrigin) | 41 PassRefPtr<DedicatedWorkerGlobalScope> DedicatedWorkerGlobalScope::create(const
KURL& url, const String& userAgent, DedicatedWorkerThread* thread, const String&
contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyT
ype, PassRefPtr<SecurityOrigin> topOrigin, double timeOrigin) |
| 42 { | 42 { |
| 43 RefPtr<DedicatedWorkerContext> context = adoptRef(new DedicatedWorkerContext
(url, userAgent, thread, topOrigin, timeOrigin)); | 43 RefPtr<DedicatedWorkerGlobalScope> context = adoptRef(new DedicatedWorkerGlo
balScope(url, userAgent, thread, topOrigin, timeOrigin)); |
| 44 context->applyContentSecurityPolicyFromString(contentSecurityPolicy, content
SecurityPolicyType); | 44 context->applyContentSecurityPolicyFromString(contentSecurityPolicy, content
SecurityPolicyType); |
| 45 return context.release(); | 45 return context.release(); |
| 46 } | 46 } |
| 47 | 47 |
| 48 DedicatedWorkerContext::DedicatedWorkerContext(const KURL& url, const String& us
erAgent, DedicatedWorkerThread* thread, PassRefPtr<SecurityOrigin> topOrigin, do
uble timeOrigin) | 48 DedicatedWorkerGlobalScope::DedicatedWorkerGlobalScope(const KURL& url, const St
ring& userAgent, DedicatedWorkerThread* thread, PassRefPtr<SecurityOrigin> topOr
igin, double timeOrigin) |
| 49 : WorkerContext(url, userAgent, thread, topOrigin, timeOrigin) | 49 : WorkerGlobalScope(url, userAgent, thread, topOrigin, timeOrigin) |
| 50 { | 50 { |
| 51 ScriptWrappable::init(this); | 51 ScriptWrappable::init(this); |
| 52 } | 52 } |
| 53 | 53 |
| 54 DedicatedWorkerContext::~DedicatedWorkerContext() | 54 DedicatedWorkerGlobalScope::~DedicatedWorkerGlobalScope() |
| 55 { | 55 { |
| 56 } | 56 } |
| 57 | 57 |
| 58 const AtomicString& DedicatedWorkerContext::interfaceName() const | 58 const AtomicString& DedicatedWorkerGlobalScope::interfaceName() const |
| 59 { | 59 { |
| 60 return eventNames().interfaceForDedicatedWorkerContext; | 60 return eventNames().interfaceForDedicatedWorkerGlobalScope; |
| 61 } | 61 } |
| 62 | 62 |
| 63 void DedicatedWorkerContext::postMessage(PassRefPtr<SerializedScriptValue> messa
ge, const MessagePortArray* ports, ExceptionCode& ec) | 63 void DedicatedWorkerGlobalScope::postMessage(PassRefPtr<SerializedScriptValue> m
essage, const MessagePortArray* ports, ExceptionCode& ec) |
| 64 { | 64 { |
| 65 // Disentangle the port in preparation for sending it to the remote context. | 65 // Disentangle the port in preparation for sending it to the remote context. |
| 66 OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(por
ts, ec); | 66 OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(por
ts, ec); |
| 67 if (ec) | 67 if (ec) |
| 68 return; | 68 return; |
| 69 thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.re
lease()); | 69 thread()->workerObjectProxy().postMessageToWorkerObject(message, channels.re
lease()); |
| 70 } | 70 } |
| 71 | 71 |
| 72 void DedicatedWorkerContext::importScripts(const Vector<String>& urls, Exception
Code& ec) | 72 void DedicatedWorkerGlobalScope::importScripts(const Vector<String>& urls, Excep
tionCode& ec) |
| 73 { | 73 { |
| 74 Base::importScripts(urls, ec); | 74 Base::importScripts(urls, ec); |
| 75 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); | 75 thread()->workerObjectProxy().reportPendingActivity(hasPendingActivity()); |
| 76 } | 76 } |
| 77 | 77 |
| 78 DedicatedWorkerThread* DedicatedWorkerContext::thread() | 78 DedicatedWorkerThread* DedicatedWorkerGlobalScope::thread() |
| 79 { | 79 { |
| 80 return static_cast<DedicatedWorkerThread*>(Base::thread()); | 80 return static_cast<DedicatedWorkerThread*>(Base::thread()); |
| 81 } | 81 } |
| 82 | 82 |
| 83 } // namespace WebCore | 83 } // namespace WebCore |
| OLD | NEW |