Chromium Code Reviews| Index: Source/core/loader/WorkerThreadableLoader.cpp |
| diff --git a/Source/core/loader/WorkerThreadableLoader.cpp b/Source/core/loader/WorkerThreadableLoader.cpp |
| index 3f09f09fa1229b74d6814cc3d05f4b8f4c232463..77cdcd11a172b5840d764ba4ee4d70a5cfc4fba0 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) |
| +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, m_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()); |
| @@ -119,7 +119,7 @@ WorkerThreadableLoader::MainThreadBridge::~MainThreadBridge() |
| void WorkerThreadableLoader::MainThreadBridge::mainThreadCreateLoader(ExecutionContext* context, MainThreadBridge* thisPtr, PassOwnPtr<CrossThreadResourceRequestData> requestData, ThreadableLoaderOptions options, const String& outgoingReferrer) |
| { |
| ASSERT(isMainThread()); |
| - Document* document = toDocument(context); |
| + Document& document = toDocument(*context); |
|
Inactive
2014/03/22 15:09:54
Dereferencing context without a assertion to make
maheshkk
2014/03/24 18:17:48
WorkerThreadableLoader::MainThreadBridge implement
|
| OwnPtr<ResourceRequest> request(ResourceRequest::adopt(requestData)); |
| request->setHTTPReferrer(Referrer(outgoingReferrer, ReferrerPolicyDefault)); |