| Index: Source/core/loader/WorkerThreadableLoader.h
|
| diff --git a/Source/core/loader/WorkerThreadableLoader.h b/Source/core/loader/WorkerThreadableLoader.h
|
| index 7991f822e7db6175f2caedbbc722ff72e4dec0a3..5f14bddec280358360d5b37c6d403863feef3319 100644
|
| --- a/Source/core/loader/WorkerThreadableLoader.h
|
| +++ b/Source/core/loader/WorkerThreadableLoader.h
|
| @@ -54,13 +54,15 @@ namespace blink {
|
| WTF_MAKE_FAST_ALLOCATED(WorkerThreadableLoader);
|
| public:
|
| static void loadResourceSynchronously(WorkerGlobalScope&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| - static PassRefPtr<WorkerThreadableLoader> create(WorkerGlobalScope& workerGlobalScope, PassRefPtr<ThreadableLoaderClientWrapper> clientWrapper, PassOwnPtr<ThreadableLoaderClient> clientBridge, const ResourceRequest& request, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
|
| + static PassRefPtr<WorkerThreadableLoader> create(WorkerGlobalScope& workerGlobalScope, PassRefPtr<ThreadableLoaderClientWrapper> clientWrapper, PassOwnPtr<ThreadableLoaderClient> clientBridge, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
|
| {
|
| - return adoptRef(new WorkerThreadableLoader(workerGlobalScope, clientWrapper, clientBridge, request, options, resourceLoaderOptions));
|
| + return adoptRef(new WorkerThreadableLoader(workerGlobalScope, clientWrapper, clientBridge, options, resourceLoaderOptions));
|
| }
|
|
|
| ~WorkerThreadableLoader() override;
|
|
|
| + void start(const ResourceRequest&) override;
|
| +
|
| void overrideTimeout(unsigned long timeout) override;
|
|
|
| void cancel() override;
|
| @@ -88,7 +90,8 @@ namespace blink {
|
| class MainThreadBridge final : public ThreadableLoaderClient {
|
| public:
|
| // All executed on the worker context's thread.
|
| - MainThreadBridge(PassRefPtr<ThreadableLoaderClientWrapper>, PassOwnPtr<ThreadableLoaderClient>, PassRefPtr<WorkerLoaderProxy>, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, const ReferrerPolicy, const String& outgoingReferrer);
|
| + MainThreadBridge(PassRefPtr<ThreadableLoaderClientWrapper>, PassOwnPtr<ThreadableLoaderClient>, PassRefPtr<WorkerLoaderProxy>, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| + void start(const ResourceRequest&, const ReferrerPolicy, const String&);
|
| void overrideTimeout(unsigned long timeoutMilliseconds);
|
| void cancel();
|
| void destroy();
|
| @@ -101,7 +104,8 @@ namespace blink {
|
| void mainThreadDestroy(ExecutionContext*);
|
| ~MainThreadBridge() override;
|
|
|
| - void mainThreadCreateLoader(PassOwnPtr<CrossThreadResourceRequestData>, ThreadableLoaderOptions, ResourceLoaderOptions, const ReferrerPolicy, const String& outgoingReferrer, ExecutionContext*);
|
| + void mainThreadCreateLoader(ThreadableLoaderOptions, ResourceLoaderOptions, ExecutionContext*);
|
| + void mainThreadStart(PassOwnPtr<CrossThreadResourceRequestData>, const ReferrerPolicy, const String& outgoingReferrer);
|
| void mainThreadOverrideTimeout(unsigned long timeoutMilliseconds, ExecutionContext*);
|
| void mainThreadCancel(ExecutionContext*);
|
| void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override;
|
| @@ -127,7 +131,7 @@ namespace blink {
|
| RefPtr<WorkerLoaderProxy> m_loaderProxy;
|
| };
|
|
|
| - WorkerThreadableLoader(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, PassOwnPtr<ThreadableLoaderClient>, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
| + WorkerThreadableLoader(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, PassOwnPtr<ThreadableLoaderClient>, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
|
|
|
| void didReceiveResourceTiming(const ResourceTimingInfo&) override;
|
|
|
|
|