Index: third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h |
diff --git a/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h b/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h |
index 713c889339d03f483c052f35bf6420d9951a8a9e..879a5e0676f1a260faa3110f56e632131abe8303 100644 |
--- a/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h |
+++ b/third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h |
@@ -54,13 +54,15 @@ class WorkerThreadableLoader final : public ThreadableLoader, private Threadable |
USING_FAST_MALLOC(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 @@ private: |
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&); |
hiroshige
2016/01/26 08:44:50
nit: The third argument is |outgoingReferrer| and
tyoshino (SeeGerritForStatus)
2016/01/29 12:36:52
Done.
|
void overrideTimeout(unsigned long timeoutMilliseconds); |
void cancel(); |
void destroy(); |
@@ -101,7 +104,8 @@ private: |
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&); |
hiroshige
2016/01/26 08:44:50
nit: ditto.
tyoshino (SeeGerritForStatus)
2016/01/29 12:36:52
Done.
|
void mainThreadOverrideTimeout(unsigned long timeoutMilliseconds, ExecutionContext*); |
void mainThreadCancel(ExecutionContext*); |
void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) override; |
@@ -127,7 +131,7 @@ private: |
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; |