Move ThreadableLoaderClientWrapper to Oilpan heap

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

 /*
  * Copyright (C) 2009, 2010 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 @@
 
 static std::unique_ptr<Vector<char>> createVectorFromMemoryRegion(const char* data, unsigned dataLength)
 {
     std::unique_ptr<Vector<char>> buffer = wrapUnique(new Vector<char>(dataLength));
     memcpy(buffer->data(), data, dataLength);
     return buffer;
 }
 
 WorkerThreadableLoader::WorkerThreadableLoader(WorkerGlobalScope& workerGlobalScope, ThreadableLoaderClient* client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions, BlockingBehavior blockingBehavior)
     : m_workerGlobalScope(&workerGlobalScope)
-    , m_workerClientWrapper(ThreadableLoaderClientWrapper::create(client))
+    , m_workerClientWrapper(new ThreadableLoaderClientWrapper(workerGlobalScope, client))
 {
-    m_workerClientWrapper->setResourceTimingClient(this);
     if (blockingBehavior == LoadAsynchronously) {
         m_bridge = new MainThreadAsyncBridge(workerGlobalScope, m_workerClientWrapper, options, resourceLoaderOptions);
     } else {
         m_bridge = new MainThreadSyncBridge(workerGlobalScope, m_workerClientWrapper, options, resourceLoaderOptions);
     }
 }
 
 void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope& workerGlobalScope, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
 {
     std::unique_ptr<WorkerThreadableLoader> loader = wrapUnique(new WorkerThreadableLoader(workerGlobalScope, &client, options, resourceLoaderOptions, LoadSynchronously));
     loader->start(request);
 }
 
 WorkerThreadableLoader::~WorkerThreadableLoader()
 {
-    m_workerClientWrapper->clearResourceTimingClient();
     m_bridge->destroy();
     m_bridge = nullptr;
 }
 
 void WorkerThreadableLoader::start(const ResourceRequest& request)
 {
     ResourceRequest requestToPass(request);
     if (!requestToPass.didSetHTTPReferrer())
         requestToPass.setHTTPReferrer(SecurityPolicy::generateReferrer(m_workerGlobalScope->getReferrerPolicy(), request.url(), m_workerGlobalScope->outgoingReferrer()));
     m_bridge->start(requestToPass, *m_workerGlobalScope);
-    m_workerClientWrapper->setResourceTimingClient(this);
 }
 
 void WorkerThreadableLoader::overrideTimeout(unsigned long timeoutMilliseconds)
 {
     ASSERT(m_bridge);
     m_bridge->overrideTimeout(timeoutMilliseconds);
 }
 
 void WorkerThreadableLoader::cancel()
 {
     ASSERT(m_bridge);
     m_bridge->cancel();
 }
 
-void WorkerThreadableLoader::didReceiveResourceTiming(const ResourceTimingInfo& info)
-{
-    WorkerGlobalScopePerformance::performance(*m_workerGlobalScope)->addResourceTiming(info);
-}
-
 WorkerThreadableLoader::MainThreadBridgeBase::MainThreadBridgeBase(
-    PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper,
+    ThreadableLoaderClientWrapper* workerClientWrapper,
     PassRefPtr<WorkerLoaderProxy> loaderProxy)
     : m_workerClientWrapper(workerClientWrapper)
     , m_loaderProxy(loaderProxy)
 {
     ASSERT(m_workerClientWrapper.get());
     ASSERT(m_loaderProxy.get());
 }
 
 WorkerThreadableLoader::MainThreadBridgeBase::~MainThreadBridgeBase()
 {
@@ skipping 28 matching lines @@
 
 void WorkerThreadableLoader::MainThreadBridgeBase::mainThreadDestroy(ExecutionContext* context)
 {
     ASSERT(isMainThread());
     ASSERT_UNUSED(context, context->isDocument());
     delete this;
 }
 
 void WorkerThreadableLoader::MainThreadBridgeBase::destroy()
 {
-    // Ensure that no more client callbacks are done in the worker context's thread.
+    // Ensure that no more client callbacks are done in the worker context's
+    // thread.
+    // ThreadableLoaderClientWrapper is an on-heap class and this function can
+    // be called in the finalization step but it is safe because
+    // m_workerClientWrapper is a CrossThreadPersistent.
     m_workerClientWrapper->clearClient();
 
-    // "delete this" and m_mainThreadLoader::deref() on the worker object's thread.
+    // "delete this" and m_mainThreadLoader::deref() on the worker object's
+    // thread.
     m_loaderProxy->postTaskToLoader(createCrossThreadTask(&MainThreadBridgeBase::mainThreadDestroy, crossThreadUnretained(this)));
 }
 
 void WorkerThreadableLoader::MainThreadBridgeBase::mainThreadOverrideTimeout(unsigned long timeoutMilliseconds, ExecutionContext* context)
 {
     ASSERT(isMainThread());
     ASSERT_UNUSED(context, context->isDocument());
 
     if (!m_mainThreadLoader)
         return;
@@ skipping 12 matching lines @@
 
     if (!m_mainThreadLoader)
         return;
     m_mainThreadLoader->cancel();
     m_mainThreadLoader = nullptr;
 }
 
 void WorkerThreadableLoader::MainThreadBridgeBase::cancel()
 {
     m_loaderProxy->postTaskToLoader(createCrossThreadTask(&MainThreadBridgeBase::mainThreadCancel, crossThreadUnretained(this)));
-    RefPtr<ThreadableLoaderClientWrapper> clientWrapper = m_workerClientWrapper;
+    ThreadableLoaderClientWrapper* clientWrapper = m_workerClientWrapper;
     if (!clientWrapper->done()) {
-        // If the client hasn't reached a termination state, then transition it by sending a cancellation error.
-        // Note: no more client callbacks will be done after this method -- the m_workerClientWrapper->clearClient() call ensures that.
+        // If the client hasn't reached a termination state, then transition it
+        // by sending a cancellation error.
+        // Note: no more client callbacks will be done after this method -- the
+        // m_workerClientWrapper->clearClient() call ensures that.
         ResourceError error(String(), 0, String(), String());
         error.setIsCancellation(true);
         clientWrapper->didFail(error);
     }
     // |this| might be already destructed here because didFail() might
     // clear a reference to ThreadableLoader, which might destruct
     // WorkerThreadableLoader and then MainThreadBridge.
     // Therefore we call clearClient() directly, rather than calling
     // this->m_workerClientWrapper->clearClient().
     clientWrapper->clearClient();
@@ skipping 44 matching lines @@
     forwardTaskToWorkerOnLoaderDone(createCrossThreadTask(&ThreadableLoaderClientWrapper::didFailRedirectCheck, m_workerClientWrapper));
 }
 
 void WorkerThreadableLoader::MainThreadBridgeBase::didReceiveResourceTiming(const ResourceTimingInfo& info)
 {
     forwardTaskToWorker(createCrossThreadTask(&ThreadableLoaderClientWrapper::didReceiveResourceTiming, m_workerClientWrapper, info));
 }
 
 WorkerThreadableLoader::MainThreadAsyncBridge::MainThreadAsyncBridge(
     WorkerGlobalScope& workerGlobalScope,
-    PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper,
+    ThreadableLoaderClientWrapper* workerClientWrapper,
     const ThreadableLoaderOptions& options,
     const ResourceLoaderOptions& resourceLoaderOptions)
     : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.thread()->workerLoaderProxy())
 {
     createLoaderInMainThread(options, resourceLoaderOptions);
 }
 
 void WorkerThreadableLoader::MainThreadAsyncBridge::start(const ResourceRequest& request, const WorkerGlobalScope& workerGlobalScope)
 {
     startInMainThread(request, workerGlobalScope);
 }
 
 WorkerThreadableLoader::MainThreadAsyncBridge::~MainThreadAsyncBridge()
 {
 }
 
 void WorkerThreadableLoader::MainThreadAsyncBridge::forwardTaskToWorker(std::unique_ptr<ExecutionContextTask> task)
 {
     loaderProxy()->postTaskToWorkerGlobalScope(std::move(task));
 }
 
 void WorkerThreadableLoader::MainThreadAsyncBridge::forwardTaskToWorkerOnLoaderDone(std::unique_ptr<ExecutionContextTask> task)
 {
     loaderProxy()->postTaskToWorkerGlobalScope(std::move(task));
 }
 
 WorkerThreadableLoader::MainThreadSyncBridge::MainThreadSyncBridge(
     WorkerGlobalScope& workerGlobalScope,
-    PassRefPtr<ThreadableLoaderClientWrapper> workerClientWrapper,
+    ThreadableLoaderClientWrapper* workerClientWrapper,
     const ThreadableLoaderOptions& options,
     const ResourceLoaderOptions& resourceLoaderOptions)
     : MainThreadBridgeBase(workerClientWrapper, workerGlobalScope.thread()->workerLoaderProxy())
     , m_done(false)
 {
     createLoaderInMainThread(options, resourceLoaderOptions);
 }
 
 void WorkerThreadableLoader::MainThreadSyncBridge::start(const ResourceRequest& request, const WorkerGlobalScope& workerGlobalScope)
 {
@@ skipping 55 matching lines @@
 
     MutexLocker lock(m_lock);
     RELEASE_ASSERT(!m_done);
 
     m_clientTasks.append(std::move(task));
     m_done = true;
     m_loaderDoneEvent->signal();
 }
 
 } // namespace blink