| Index: Source/core/workers/UIWorkerThread.cpp
|
| diff --git a/Source/core/workers/SharedWorkerThread.cpp b/Source/core/workers/UIWorkerThread.cpp
|
| similarity index 60%
|
| copy from Source/core/workers/SharedWorkerThread.cpp
|
| copy to Source/core/workers/UIWorkerThread.cpp
|
| index 63b339eb7e472a01175bbb16a266c72d0b631b45..e9884e898a49d4971e6fea48b66155e9303f5196 100644
|
| --- a/Source/core/workers/SharedWorkerThread.cpp
|
| +++ b/Source/core/workers/UIWorkerThread.cpp
|
| @@ -30,31 +30,36 @@
|
|
|
| #include "config.h"
|
|
|
| -#include "core/workers/SharedWorkerThread.h"
|
| +#include "core/workers/UIWorkerThread.h"
|
|
|
| -#include "core/workers/SharedWorkerGlobalScope.h"
|
| +#include "core/workers/UIWorkerGlobalScope.h"
|
| +#include "core/workers/WorkerObjectProxy.h"
|
| #include "core/workers/WorkerThreadStartupData.h"
|
|
|
| +#include "public/platform/Platform.h"
|
| +#include "public/platform/WebThread.h"
|
| +#include "platform/UIWebThreadSupportingGC.h"
|
| +
|
| namespace blink {
|
|
|
| -PassRefPtr<SharedWorkerThread> SharedWorkerThread::create(const String& name, WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData)
|
| +PassRefPtr<UIWorkerThread> UIWorkerThread::create(WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData)
|
| {
|
| - return adoptRef(new SharedWorkerThread(name, workerLoaderProxy, workerReportingProxy, startupData));
|
| + return adoptRef(new UIWorkerThread(workerLoaderProxy, workerObjectProxy, timeOrigin, startupData));
|
| }
|
|
|
| -SharedWorkerThread::SharedWorkerThread(const String& name, WorkerLoaderProxy& workerLoaderProxy, WorkerReportingProxy& workerReportingProxy, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData)
|
| - : WorkerThread(workerLoaderProxy, workerReportingProxy, startupData)
|
| - , m_name(name.isolatedCopy())
|
| +UIWorkerThread::UIWorkerThread(WorkerLoaderProxy& workerLoaderProxy, WorkerObjectProxy& workerObjectProxy, double timeOrigin, PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData)
|
| + : DedicatedWorkerThread(workerLoaderProxy, workerObjectProxy, timeOrigin, startupData)
|
| {
|
| }
|
|
|
| -SharedWorkerThread::~SharedWorkerThread()
|
| +UIWorkerThread::~UIWorkerThread()
|
| {
|
| }
|
|
|
| -PassRefPtrWillBeRawPtr<WorkerGlobalScope> SharedWorkerThread::createWorkerGlobalScope(PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData)
|
| +PassRefPtrWillBeRawPtr<WorkerGlobalScope> UIWorkerThread::createWorkerGlobalScope(PassOwnPtrWillBeRawPtr<WorkerThreadStartupData> startupData)
|
| {
|
| - return SharedWorkerGlobalScope::create(m_name, this, startupData);
|
| + return UIWorkerGlobalScope::create(this, startupData, timeOrigin());
|
| }
|
|
|
| } // namespace blink
|
| +
|
|
|