Move ThreadableLoaderClientWrapper to Oilpan heap

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 39 matching lines @@
 
 class ExecutionContextTask;
 class ResourceError;
 class ResourceRequest;
 class ResourceResponse;
 class WaitableEvent;
 class WorkerGlobalScope;
 class WorkerLoaderProxy;
 struct CrossThreadResourceRequestData;
 
-class WorkerThreadableLoader final : public ThreadableLoader, private ThreadableLoaderClientWrapper::ResourceTimingClient {
+class WorkerThreadableLoader final : public ThreadableLoader {
     USING_FAST_MALLOC(WorkerThreadableLoader);
 public:
     static void loadResourceSynchronously(WorkerGlobalScope&, const ResourceRequest&, ThreadableLoaderClient&, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
     static std::unique_ptr<WorkerThreadableLoader> create(WorkerGlobalScope& workerGlobalScope, ThreadableLoaderClient* client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
     {
         return wrapUnique(new WorkerThreadableLoader(workerGlobalScope, client, options, resourceLoaderOptions, LoadAsynchronously));
     }
 
     ~WorkerThreadableLoader() override;
 
@@ skipping 24 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>);
+        MainThreadBridgeBase(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&, std::unique_ptr<WebDataConsumerHandle>) final;
         void didReceiveData(const char*, unsigned dataLength) final;
         void didDownloadData(int dataLength) final;
@@ skipping 27 matching lines @@
         // All executed on the main thread.
         void mainThreadCreateLoader(ThreadableLoaderOptions, ResourceLoaderOptions, ExecutionContext*);
         void mainThreadStart(std::unique_ptr<CrossThreadResourceRequestData>);
         void mainThreadDestroy(ExecutionContext*);
         void mainThreadOverrideTimeout(unsigned long timeoutMilliseconds, ExecutionContext*);
         void mainThreadCancel(ExecutionContext*);
 
         // Only to be used on the main thread.
         std::unique_ptr<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;
+        // |m_workerClientWrapper| holds an pointer created on the worker
+        // thread, and |this| instance is created on the main thread.
+        CrossThreadPersistent<ThreadableLoaderClientWrapper> m_workerClientWrapper;
 
         // Used on the worker context thread.
         RefPtr<WorkerLoaderProxy> m_loaderProxy;
     };
 
     class MainThreadAsyncBridge final : public MainThreadBridgeBase {
     public:
-        MainThreadAsyncBridge(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
+        MainThreadAsyncBridge(WorkerGlobalScope&, ThreadableLoaderClientWrapper*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
         void start(const ResourceRequest&, const WorkerGlobalScope&) override;
 
     private:
         ~MainThreadAsyncBridge() override;
 
         void forwardTaskToWorker(std::unique_ptr<ExecutionContextTask>) override;
         void forwardTaskToWorkerOnLoaderDone(std::unique_ptr<ExecutionContextTask>) override;
     };
 
     class MainThreadSyncBridge final : public MainThreadBridgeBase {
     public:
-        MainThreadSyncBridge(WorkerGlobalScope&, PassRefPtr<ThreadableLoaderClientWrapper>, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
+        MainThreadSyncBridge(WorkerGlobalScope&, ThreadableLoaderClientWrapper*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&);
         void start(const ResourceRequest&, const WorkerGlobalScope&) override;
 
     private:
         ~MainThreadSyncBridge() override;
 
         void forwardTaskToWorker(std::unique_ptr<ExecutionContextTask>) override;
         void forwardTaskToWorkerOnLoaderDone(std::unique_ptr<ExecutionContextTask>) override;
 
         bool m_done;
         std::unique_ptr<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<std::unique_ptr<ExecutionContextTask>> m_clientTasks;
         Mutex m_lock;
     };
 
     WorkerThreadableLoader(WorkerGlobalScope&, ThreadableLoaderClient*, const ThreadableLoaderOptions&, const ResourceLoaderOptions&, BlockingBehavior);
 
-    void didReceiveResourceTiming(const ResourceTimingInfo&) override;
-
     Persistent<WorkerGlobalScope> m_workerGlobalScope;
-    RefPtr<ThreadableLoaderClientWrapper> m_workerClientWrapper;
+    const Persistent<ThreadableLoaderClientWrapper> m_workerClientWrapper;
 
     MainThreadBridgeBase* m_bridge;
 };
 
 } // namespace blink
 
 #endif // WorkerThreadableLoader_h