| Index: Source/core/loader/WorkerThreadableLoader.cpp
|
| diff --git a/Source/core/loader/WorkerThreadableLoader.cpp b/Source/core/loader/WorkerThreadableLoader.cpp
|
| index 0a0adf40966c9665a8bfd7f3c087e2faec6f1f2c..aad4f0cc99303d40bdf09c3acea1c8ae3f7357f7 100644
|
| --- a/Source/core/loader/WorkerThreadableLoader.cpp
|
| +++ b/Source/core/loader/WorkerThreadableLoader.cpp
|
| @@ -38,7 +38,7 @@
|
| #include "core/loader/WorkerLoaderClientBridgeSyncHelper.h"
|
| #include "core/workers/WorkerGlobalScope.h"
|
| #include "core/workers/WorkerLoaderProxy.h"
|
| -#include "core/workers/WorkerThread.h"
|
| +#include "core/workers/WorkerScript.h"
|
| #include "platform/heap/SafePoint.h"
|
| #include "platform/network/ResourceError.h"
|
| #include "platform/network/ResourceRequest.h"
|
| @@ -55,7 +55,7 @@ namespace blink {
|
| WorkerThreadableLoader::WorkerThreadableLoader(WorkerGlobalScope& workerGlobalScope, PassRefPtr<ThreadableLoaderClientWrapper> clientWrapper, PassOwnPtr<ThreadableLoaderClient> clientBridge, const ResourceRequest& request, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
|
| : m_workerGlobalScope(&workerGlobalScope)
|
| , m_workerClientWrapper(clientWrapper)
|
| - , m_bridge(*(new MainThreadBridge(m_workerClientWrapper, clientBridge, workerGlobalScope.thread()->workerLoaderProxy(), request, options, resourceLoaderOptions, workerGlobalScope.referrerPolicy(), workerGlobalScope.url().strippedForUseAsReferrer())))
|
| + , m_bridge(*(new MainThreadBridge(m_workerClientWrapper, clientBridge, workerGlobalScope.script()->workerLoaderProxy(), request, options, resourceLoaderOptions, workerGlobalScope.referrerPolicy(), workerGlobalScope.url().strippedForUseAsReferrer())))
|
| {
|
| }
|
|
|
| @@ -67,7 +67,7 @@ WorkerThreadableLoader::~WorkerThreadableLoader()
|
| void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope& workerGlobalScope, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
|
| {
|
| WebWaitableEvent* shutdownEvent =
|
| - workerGlobalScope.thread()->shutdownEvent();
|
| + workerGlobalScope.script()->shutdownEvent();
|
| OwnPtr<WebWaitableEvent> loaderDone =
|
| adoptPtr(Platform::current()->createWaitableEvent());
|
|
|
|
|