| 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 19 matching lines...) Expand all Loading... |
| 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/DedicatedWorkerContext.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 GroupSettings* settings, const String& sou
rceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectPr
oxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, Conte
ntSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* to
pOrigin) | 40 PassRefPtr<DedicatedWorkerThread> DedicatedWorkerThread::create(const KURL& scri
ptURL, const String& userAgent, const GroupSettings* settings, const String& sou
rceCode, WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectPr
oxy, WorkerThreadStartMode startMode, const String& contentSecurityPolicy, Conte
ntSecurityPolicy::HeaderType contentSecurityPolicyType, const SecurityOrigin* to
pOrigin, double timeOrigin) |
| 41 { | 41 { |
| 42 return adoptRef(new DedicatedWorkerThread(scriptURL, userAgent, settings, so
urceCode, workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy
, contentSecurityPolicyType, topOrigin)); | 42 return adoptRef(new DedicatedWorkerThread(scriptURL, userAgent, settings, so
urceCode, workerLoaderProxy, workerObjectProxy, startMode, contentSecurityPolicy
, contentSecurityPolicyType, topOrigin, timeOrigin)); |
| 43 } | 43 } |
| 44 | 44 |
| 45 DedicatedWorkerThread::DedicatedWorkerThread(const KURL& url, const String& user
Agent, const GroupSettings* settings, const String& sourceCode, WorkerLoaderProx
y& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMod
e startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderT
ype contentSecurityPolicyType, const SecurityOrigin* topOrigin) | 45 DedicatedWorkerThread::DedicatedWorkerThread(const KURL& url, const String& user
Agent, const GroupSettings* settings, const String& sourceCode, WorkerLoaderProx
y& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, WorkerThreadStartMod
e startMode, const String& contentSecurityPolicy, ContentSecurityPolicy::HeaderT
ype contentSecurityPolicyType, const SecurityOrigin* topOrigin, double timeOrigi
n) |
| 46 : WorkerThread(url, userAgent, settings, sourceCode, workerLoaderProxy, work
erObjectProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topO
rigin) | 46 : WorkerThread(url, userAgent, settings, sourceCode, workerLoaderProxy, work
erObjectProxy, startMode, contentSecurityPolicy, contentSecurityPolicyType, topO
rigin) |
| 47 , m_workerObjectProxy(workerObjectProxy) | 47 , m_workerObjectProxy(workerObjectProxy) |
| 48 , m_timeOrigin(timeOrigin) |
| 48 { | 49 { |
| 49 } | 50 } |
| 50 | 51 |
| 51 DedicatedWorkerThread::~DedicatedWorkerThread() | 52 DedicatedWorkerThread::~DedicatedWorkerThread() |
| 52 { | 53 { |
| 53 } | 54 } |
| 54 | 55 |
| 55 PassRefPtr<WorkerContext> DedicatedWorkerThread::createWorkerContext(const KURL&
url, const String& userAgent, PassOwnPtr<GroupSettings> settings, const String&
contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyT
ype, PassRefPtr<SecurityOrigin> topOrigin) | 56 PassRefPtr<WorkerContext> DedicatedWorkerThread::createWorkerContext(const KURL&
url, const String& userAgent, PassOwnPtr<GroupSettings> settings, const String&
contentSecurityPolicy, ContentSecurityPolicy::HeaderType contentSecurityPolicyT
ype, PassRefPtr<SecurityOrigin> topOrigin) |
| 56 { | 57 { |
| 57 return DedicatedWorkerContext::create(url, userAgent, settings, this, conten
tSecurityPolicy, contentSecurityPolicyType, topOrigin); | 58 return DedicatedWorkerContext::create(url, userAgent, settings, this, conten
tSecurityPolicy, contentSecurityPolicyType, topOrigin, m_timeOrigin); |
| 58 } | 59 } |
| 59 | 60 |
| 60 void DedicatedWorkerThread::runEventLoop() | 61 void DedicatedWorkerThread::runEventLoop() |
| 61 { | 62 { |
| 62 // 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. |
| 63 m_workerObjectProxy.reportPendingActivity(workerContext()->hasPendingActivit
y()); | 64 m_workerObjectProxy.reportPendingActivity(workerContext()->hasPendingActivit
y()); |
| 64 WorkerThread::runEventLoop(); | 65 WorkerThread::runEventLoop(); |
| 65 } | 66 } |
| 66 | 67 |
| 67 } // namespace WebCore | 68 } // namespace WebCore |
| OLD | NEW |