| Index: Source/core/loader/WorkerThreadableLoader.cpp
|
| diff --git a/Source/core/loader/WorkerThreadableLoader.cpp b/Source/core/loader/WorkerThreadableLoader.cpp
|
| index 3f09f09fa1229b74d6814cc3d05f4b8f4c232463..47e78e9230bd6cf91ffd67340ed405a84f3b2c1c 100644
|
| --- a/Source/core/loader/WorkerThreadableLoader.cpp
|
| +++ b/Source/core/loader/WorkerThreadableLoader.cpp
|
| @@ -51,10 +51,10 @@
|
|
|
| namespace WebCore {
|
|
|
| -WorkerThreadableLoader::WorkerThreadableLoader(WorkerGlobalScope* workerGlobalScope, PassRefPtr<ThreadableLoaderClientWrapper> clientWrapper, PassOwnPtr<ThreadableLoaderClient> clientBridge, const ResourceRequest& request, const ThreadableLoaderOptions& options)
|
| - : m_workerGlobalScope(workerGlobalScope)
|
| +WorkerThreadableLoader::WorkerThreadableLoader(WorkerGlobalScope& workerGlobalScope, PassRefPtr<ThreadableLoaderClientWrapper> clientWrapper, PassOwnPtr<ThreadableLoaderClient> clientBridge, const ResourceRequest& request, const ThreadableLoaderOptions& options)
|
| + : m_workerGlobalScope(&workerGlobalScope)
|
| , m_workerClientWrapper(clientWrapper)
|
| - , m_bridge(*(new MainThreadBridge(m_workerClientWrapper, clientBridge, m_workerGlobalScope->thread()->workerLoaderProxy(), request, options, workerGlobalScope->url().strippedForUseAsReferrer())))
|
| + , m_bridge(*(new MainThreadBridge(m_workerClientWrapper, clientBridge, workerGlobalScope.thread()->workerLoaderProxy(), request, options, workerGlobalScope.url().strippedForUseAsReferrer())))
|
| {
|
| }
|
|
|
| @@ -63,10 +63,10 @@ WorkerThreadableLoader::~WorkerThreadableLoader()
|
| m_bridge.destroy();
|
| }
|
|
|
| -void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope* workerGlobalScope, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
|
| +void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope& workerGlobalScope, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
|
| {
|
| blink::WebWaitableEvent* shutdownEvent =
|
| - workerGlobalScope->thread()->shutdownEvent();
|
| + workerGlobalScope.thread()->shutdownEvent();
|
| OwnPtr<blink::WebWaitableEvent> loaderDone =
|
| adoptPtr(blink::Platform::current()->createWaitableEvent());
|
|
|
| @@ -124,7 +124,7 @@ void WorkerThreadableLoader::MainThreadBridge::mainThreadCreateLoader(ExecutionC
|
| OwnPtr<ResourceRequest> request(ResourceRequest::adopt(requestData));
|
| request->setHTTPReferrer(Referrer(outgoingReferrer, ReferrerPolicyDefault));
|
| options.requestInitiatorContext = WorkerContext;
|
| - thisPtr->m_mainThreadLoader = DocumentThreadableLoader::create(document, thisPtr, *request, options);
|
| + thisPtr->m_mainThreadLoader = DocumentThreadableLoader::create(*document, thisPtr, *request, options);
|
| if (!thisPtr->m_mainThreadLoader) {
|
| // DocumentThreadableLoader::create may return 0 when the document loader has been already changed.
|
| thisPtr->didFail(ResourceError(errorDomainBlinkInternal, 0, request->url().string(), "Can't create DocumentThreadableLoader"));
|
|
|