| 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/SharedWorkerThread.h" | 33 #include "core/workers/UIWorkerThread.h" |
| 34 | 34 |
| 35 #include "core/workers/SharedWorkerGlobalScope.h" | 35 #include "core/workers/UIWorkerGlobalScope.h" |
| 36 #include "core/workers/WorkerObjectProxy.h" |
| 36 #include "core/workers/WorkerThreadStartupData.h" | 37 #include "core/workers/WorkerThreadStartupData.h" |
| 37 | 38 |
| 39 #include "public/platform/Platform.h" |
| 40 #include "public/platform/WebThread.h" |
| 41 #include "platform/UIWebThreadSupportingGC.h" |
| 42 |
| 38 namespace blink { | 43 namespace blink { |
| 39 | 44 |
| 40 PassRefPtr<SharedWorkerThread> SharedWorkerThread::create(const String& name, Wo
rkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy,
PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData) | 45 PassRefPtr<UIWorkerThread> UIWorkerThread::create(WorkerLoaderProxy& workerLoade
rProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, PassOwnPtrWillB
eRawPtr<WorkerThreadStartupData> startupData) |
| 41 { | 46 { |
| 42 return adoptRef(new SharedWorkerThread(name, workerLoaderProxy, workerReport
ingProxy, startupData)); | 47 return adoptRef(new UIWorkerThread(workerLoaderProxy, workerObjectProxy, tim
eOrigin, startupData)); |
| 43 } | 48 } |
| 44 | 49 |
| 45 SharedWorkerThread::SharedWorkerThread(const String& name, WorkerLoaderProxy& wo
rkerLoaderProxy, WorkerReportingProxy& workerReportingProxy, PassOwnPtrWillBeRaw
Ptr<WorkerThreadStartupData> startupData) | 50 UIWorkerThread::UIWorkerThread(WorkerLoaderProxy& workerLoaderProxy, WorkerObjec
tProxy& workerObjectProxy, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerThrea
dStartupData> startupData) |
| 46 : WorkerThread(workerLoaderProxy, workerReportingProxy, startupData) | 51 : DedicatedWorkerThread(workerLoaderProxy, workerObjectProxy, timeOrigin, st
artupData) |
| 47 , m_name(name.isolatedCopy()) | |
| 48 { | 52 { |
| 49 } | 53 } |
| 50 | 54 |
| 51 SharedWorkerThread::~SharedWorkerThread() | 55 UIWorkerThread::~UIWorkerThread() |
| 52 { | 56 { |
| 53 } | 57 } |
| 54 | 58 |
| 55 PassRefPtrWillBeRawPtr<WorkerGlobalScope> SharedWorkerThread::createWorkerGlobal
Scope(PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData) | 59 PassRefPtrWillBeRawPtr<WorkerGlobalScope> UIWorkerThread::createWorkerGlobalScop
e(PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData) |
| 56 { | 60 { |
| 57 return SharedWorkerGlobalScope::create(m_name, this, startupData); | 61 return UIWorkerGlobalScope::create(this, startupData, timeOrigin()); |
| 58 } | 62 } |
| 59 | 63 |
| 60 } // namespace blink | 64 } // namespace blink |
| 65 |
| OLD | NEW |