| Index: Source/core/loader/ThreadableLoader.cpp
|
| diff --git a/Source/core/loader/ThreadableLoader.cpp b/Source/core/loader/ThreadableLoader.cpp
|
| index 01f5079eff47355c9cc8e5211d823752e41bfe4f..ed54bac70d62b5b9d8b0b13318d3688650e8d16c 100644
|
| --- a/Source/core/loader/ThreadableLoader.cpp
|
| +++ b/Source/core/loader/ThreadableLoader.cpp
|
| @@ -43,7 +43,7 @@
|
|
|
| namespace WebCore {
|
|
|
| -PassRefPtr<ThreadableLoader> ThreadableLoader::create(ExecutionContext& context, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options)
|
| +PassRefPtr<ThreadableLoader> ThreadableLoader::create(ExecutionContext& context, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
|
| {
|
| ASSERT(client);
|
|
|
| @@ -51,20 +51,20 @@ PassRefPtr<ThreadableLoader> ThreadableLoader::create(ExecutionContext& context,
|
| WorkerGlobalScope& workerGlobalScope = toWorkerGlobalScope(context);
|
| RefPtr<ThreadableLoaderClientWrapper> clientWrapper(ThreadableLoaderClientWrapper::create(client));
|
| OwnPtr<ThreadableLoaderClient> clientBridge(WorkerLoaderClientBridge::create(clientWrapper, workerGlobalScope.thread()->workerLoaderProxy()));
|
| - return WorkerThreadableLoader::create(workerGlobalScope, clientWrapper, clientBridge.release(), request, options);
|
| + return WorkerThreadableLoader::create(workerGlobalScope, clientWrapper, clientBridge.release(), request, options, resourceLoaderOptions);
|
| }
|
|
|
| - return DocumentThreadableLoader::create(toDocument(context), client, request, options);
|
| + return DocumentThreadableLoader::create(toDocument(context), client, request, options, resourceLoaderOptions);
|
| }
|
|
|
| -void ThreadableLoader::loadResourceSynchronously(ExecutionContext& context, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options)
|
| +void ThreadableLoader::loadResourceSynchronously(ExecutionContext& context, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
|
| {
|
| if (context.isWorkerGlobalScope()) {
|
| - WorkerThreadableLoader::loadResourceSynchronously(toWorkerGlobalScope(context), request, client, options);
|
| + WorkerThreadableLoader::loadResourceSynchronously(toWorkerGlobalScope(context), request, client, options, resourceLoaderOptions);
|
| return;
|
| }
|
|
|
| - DocumentThreadableLoader::loadResourceSynchronously(toDocument(context), request, client, options);
|
| + DocumentThreadableLoader::loadResourceSynchronously(toDocument(context), request, client, options, resourceLoaderOptions);
|
| }
|
|
|
| } // namespace WebCore
|
|
|