| 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 14 matching lines...) Expand all Loading... |
| 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/DedicatedWorkerThread.h" | 33 #include "core/workers/DedicatedWorkerThread.h" |
| 34 | 34 |
| 35 #include "core/workers/DedicatedWorkerContext.h" | 35 #include "core/workers/DedicatedWorkerGlobalScope.h" |
| 36 #include "core/workers/WorkerObjectProxy.h" | 36 #include "core/workers/WorkerObjectProxy.h" |
| 37 | 37 |
| 38 namespace WebCore { | 38 namespace WebCore { |
| 39 | 39 |
| 40 PassRefPtr<DedicatedWorkerThread> DedicatedWorkerThread::create(const KURL& scri
ptURL, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& wor
kerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMode star
tMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType co
ntentSecurityPolicyType, const SecurityOrigin* topOrigin, double timeOrigin) | 40 PassRefPtr<DedicatedWorkerThread> DedicatedWorkerThread::create(const KURL& scri
ptURL, const String& userAgent, const String& sourceCode, WorkerLoaderProxy& wor
kerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMode star
tMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderType co
ntentSecurityPolicyType, const SecurityOrigin* topOrigin, double timeOrigin) |
| 41 { | 41 { |
| 42 return adoptRef(new DedicatedWorkerThread(scriptURL, userAgent, sourceCode,
workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy, contentS
ecurityPolicyType, topOrigin, timeOrigin)); | 42 return adoptRef(new DedicatedWorkerThread(scriptURL, userAgent, sourceCode,
workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy, contentS
ecurityPolicyType, topOrigin, timeOrigin)); |
| 43 } | 43 } |
| 44 | 44 |
| 45 DedicatedWorkerThread::DedicatedWorkerThread(const KURL& url, const String& user
Agent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObj
ectProxy& workerObjectProxy, WorkerThreadStartMode startMode, const String& cont
entSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType,
const SecurityOrigin* topOrigin, double timeOrigin) | 45 DedicatedWorkerThread::DedicatedWorkerThread(const KURL& url, const String& user
Agent, const String& sourceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObj
ectProxy& workerObjectProxy, WorkerThreadStartMode startMode, const String& cont
entSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyType,
const SecurityOrigin* topOrigin, double timeOrigin) |
| 46 : WorkerThread(url, userAgent, sourceCode, workerLoaderProxy, workerObjectPr
oxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin) | 46 : WorkerThread(url, userAgent, sourceCode, workerLoaderProxy, workerObjectPr
oxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topOrigin) |
| 47 , m_workerObjectProxy(workerObjectProxy) | 47 , m_workerObjectProxy(workerObjectProxy) |
| 48 , m_timeOrigin(timeOrigin) | 48 , m_timeOrigin(timeOrigin) |
| 49 { | 49 { |
| 50 } | 50 } |
| 51 | 51 |
| 52 DedicatedWorkerThread::~DedicatedWorkerThread() | 52 DedicatedWorkerThread::~DedicatedWorkerThread() |
| 53 { | 53 { |
| 54 } | 54 } |
| 55 | 55 |
| 56 PassRefPtr<WorkerContext> DedicatedWorkerThread::createWorkerContext(const KURL&
url, const String& userAgent, const String& contentSecurityPolicy, ContentSecur
ityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrigin> topO
rigin) | 56 PassRefPtr<WorkerGlobalScope> DedicatedWorkerThread::createWorkerGlobalScope(con
st KURL& url, const String& userAgent, const String& contentSecurityPolicy, Cont
entSecurityPolicy::HeaderType contentSecurityPolicyType, PassRefPtr<SecurityOrig
in> topOrigin) |
| 57 { | 57 { |
| 58 return DedicatedWorkerContext::create(url, userAgent, this, contentSecurityP
olicy, contentSecurityPolicyType, topOrigin, m_timeOrigin); | 58 return DedicatedWorkerGlobalScope::create(url, userAgent, this, contentSecur
ityPolicy, contentSecurityPolicyType, topOrigin, m_timeOrigin); |
| 59 } | 59 } |
| 60 | 60 |
| 61 void DedicatedWorkerThread::runEventLoop() | 61 void DedicatedWorkerThread::runEventLoop() |
| 62 { | 62 { |
| 63 // Notify the parent object of our current active state before calling the s
uperclass to run the event loop. | 63 // Notify the parent object of our current active state before calling the s
uperclass to run the event loop. |
| 64 m_workerObjectProxy.reportPendingActivity(workerContext()->hasPendingActivit
y()); | 64 m_workerObjectProxy.reportPendingActivity(workerGlobalScope()->hasPendingAct
ivity()); |
| 65 WorkerThread::runEventLoop(); | 65 WorkerThread::runEventLoop(); |
| 66 } | 66 } |
| 67 | 67 |
| 68 } // namespace WebCore | 68 } // namespace WebCore |
| OLD | NEW |