Split the constructor of ThreadableLoader into two methods (ctor and start())

third_party/WebKit/Source/core/loader/WorkerThreadableLoader.h

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 43 matching lines @@
 class ResourceResponse;
 class WaitableEvent;
 class WorkerGlobalScope;
 class WorkerLoaderProxy;
 struct CrossThreadResourceRequestData;
 
 class WorkerThreadableLoader final : public ThreadableLoader, private ThreadableLoaderClientWrapper::ResourceTimingClient {
     USING_FAST_MALLOC(WorkerThreadableLoader);
 public:
     static void loadResourceSynchronously(WorkerGlobalScope&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
-    static PassRefPtr<WorkerThreadableLoader> create(WorkerGlobalScope& workerGlobalScope, ThreadableLoaderClient* client, const ResourceRequest& request, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
+    static PassRefPtr<WorkerThreadableLoader> create(WorkerGlobalScope& workerGlobalScope, ThreadableLoaderClient* client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
     {
-        return adoptRef(new WorkerThreadableLoader(workerGlobalScope, client, request, options, resourceLoaderOptions, LoadAsynchronously));
+        return adoptRef(new WorkerThreadableLoader(workerGlobalScope, client, options, resourceLoaderOptions, LoadAsynchronously));
     }
 
     ~WorkerThreadableLoader() override;
 
+    void start(const ResourceRequest&) override;
+
     void overrideTimeout(unsigned long timeout) override;
 
     void cancel() override;
 
 private:
     enum BlockingBehavior {
         LoadSynchronously,
         LoadAsynchronously
     };
 
@@ skipping 13 matching lines @@
     // case 2. xhr gets aborted and the worker context continues running.
     //    The ThreadableLoaderClientWrapper has the underlying client cleared, so no more calls
     //    go through it.  All tasks posted from the worker object's thread to the worker context's
     //    thread do "ThreadableLoaderClientWrapper::ref" (automatically inside of the cross thread copy
     //    done in createCrossThreadTask), so the ThreadableLoaderClientWrapper instance is there until all
     //    tasks are executed.
     class MainThreadBridgeBase : public ThreadableLoaderClient {
     public:
         // All executed on the worker context's thread.
         MainThreadBridgeBase(PassRefPtr<ThreadableLoaderClientWrapper>, PassRefPtr<WorkerLoaderProxy>);
+        virtual void start(const ResourceRequest&, const WorkerGlobalScope&) = 0;
         void overrideTimeout(unsigned long timeoutMilliseconds);
         void cancel();
         void destroy();
 
         // All executed on the main thread.
         void didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent) final;
         void didReceiveResponse(unsigned long identifier, const ResourceResponse&, PassOwnPtr<WebDataConsumerHandle>) final;
         void didReceiveData(const char*, unsigned dataLength) final;
         void didDownloadData(int dataLength) final;
         void didReceiveCachedMetadata(const char*, int dataLength) final;
         void didFinishLoading(unsigned long identifier, double finishTime) final;
         void didFail(const ResourceError&) final;
         void didFailAccessControlCheck(const ResourceError&) final;
         void didFailRedirectCheck() final;
         void didReceiveResourceTiming(const ResourceTimingInfo&) final;
 
     protected:
         ~MainThreadBridgeBase() override;
 
         // Posts a task to the main thread to run mainThreadCreateLoader().
-        void createLoader(const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, const ReferrerPolicy&, const String&);
+        void createLoaderInMainThread(const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
+        // Posts a task to the main thread to run mainThreadStart();
+        void startInMainThread(const ResourceRequest&, const WorkerGlobalScope&);
 
         WorkerLoaderProxy* loaderProxy()
         {
             return m_loaderProxy.get();
         }
 
-        PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper()
-        {
-            return m_workerClientWrapper;
-        }
-
     private:
         // The following methods are overridden by the subclasses to implement
         // code to forward did.* method invocations to the worker context's
         // thread which is specialized for sync and async case respectively.
         virtual void forwardTaskToWorker(PassOwnPtr<ExecutionContextTask>) = 0;
         virtual void forwardTaskToWorkerOnLoaderDone(PassOwnPtr<ExecutionContextTask>) = 0;
 
         // All executed on the main thread.
-        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 mainThreadDestroy(ExecutionContext*);
         void mainThreadOverrideTimeout(unsigned long timeoutMilliseconds, ExecutionContext*);
         void mainThreadCancel(ExecutionContext*);
 
         // Only to be used on the main thread.
         RefPtr<ThreadableLoader> m_mainThreadLoader;
 
         // ThreadableLoaderClientWrapper is to be used on the worker context thread.
         // The ref counting is done on either thread:
         // - worker context's thread: held by the tasks
         // - main thread: held by MainThreadBridgeBase
         // Therefore, this must be a ThreadSafeRefCounted.
         RefPtr<ThreadableLoaderClientWrapper> m_workerClientWrapper;
 
         // Used on the worker context thread.
         RefPtr<WorkerLoaderProxy> m_loaderProxy;
     };
 
     class MainThreadAsyncBridge final : public MainThreadBridgeBase {
     public:
-        MainThreadAsyncBridge(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, const ReferrerPolicy, const String& outgoingReferrer);
+        MainThreadAsyncBridge(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
+        void start(const ResourceRequest&, const WorkerGlobalScope&) override;
 
     private:
         ~MainThreadAsyncBridge() override;
 
         void forwardTaskToWorker(PassOwnPtr<ExecutionContextTask>) override;
         void forwardTaskToWorkerOnLoaderDone(PassOwnPtr<ExecutionContextTask>) override;
     };
 
     class MainThreadSyncBridge final : public MainThreadBridgeBase {
     public:
-        MainThreadSyncBridge(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, const ReferrerPolicy, const String& outgoingReferrer);
+        MainThreadSyncBridge(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
+        void start(const ResourceRequest&, const WorkerGlobalScope&) override;
 
     private:
         ~MainThreadSyncBridge() override;
 
         void forwardTaskToWorker(PassOwnPtr<ExecutionContextTask>) override;
         void forwardTaskToWorkerOnLoaderDone(PassOwnPtr<ExecutionContextTask>) override;
 
         bool m_done;
         OwnPtr<WaitableEvent> m_loaderDoneEvent;
         // Thread-safety: |m_clientTasks| can be written (i.e. Closures are added)
         // on the main thread only before |m_loaderDoneEvent| is signaled and can be read
         // on the worker context thread only after |m_loaderDoneEvent| is signaled.
         Vector<OwnPtr<ExecutionContextTask>> m_clientTasks;
         Mutex m_lock;
     };
 
-    WorkerThreadableLoader(WorkerGlobalScope&, ThreadableLoaderClient*, const ResourceRequest&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, BlockingBehavior);
+    WorkerThreadableLoader(WorkerGlobalScope&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, BlockingBehavior);
 
     void didReceiveResourceTiming(const ResourceTimingInfo&) override;
 
     RefPtrWillBePersistent<WorkerGlobalScope> m_workerGlobalScope;
     RefPtr<ThreadableLoaderClientWrapper> m_workerClientWrapper;
 
     MainThreadBridgeBase* m_bridge;
 };
 
 } // namespace blink
 
 #endif // WorkerThreadableLoader_h