Clear MainThreadLoaderHolder::m_workerLoader appropriately

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 207 matching lines @@
 }
 
 void WorkerThreadableLoader::loadResourceSynchronously(WorkerGlobalScope& workerGlobalScope, const ResourceRequest& request, ThreadableLoaderClient& client, const ThreadableLoaderOptions& options, const ResourceLoaderOptions& resourceLoaderOptions)
 {
     (new WorkerThreadableLoader(workerGlobalScope, &client, options, resourceLoaderOptions, LoadSynchronously))->start(request);
 }
 
 WorkerThreadableLoader::~WorkerThreadableLoader()
 {
     DCHECK(!m_mainThreadLoaderHolder);
     DCHECK(!m_client);

[haraken, 2016/08/18 04:58:37]

Shall we add DCHECK(!m_workerLoader)?

[yhirano, 2016/08/18 05:09:04]

Oops, the CL description was wrong. m_workerLoader is a WorkerThreadableLoader
held by MainThreadLoaderHolder. MainThreadLoaderHolder already has the DCHECK.

Fixed the CL description.

 }
 
 void WorkerThreadableLoader::start(const ResourceRequest& originalRequest)
 {
     ResourceRequest request(originalRequest);
     if (!request.didSetHTTPReferrer())
         request.setHTTPReferrer(SecurityPolicy::generateReferrer(m_workerGlobalScope->getReferrerPolicy(), request.url(), m_workerGlobalScope->outgoingReferrer()));
 
     DCHECK(!isMainThread());
     RefPtr<WaitableEventWithTasks> eventWithTasks;
@@ skipping 221 matching lines @@
 {
     DCHECK(isMainThread());
     if (!m_mainThreadLoader)
         return;
     m_mainThreadLoader->overrideTimeout(timeoutMilliseconds);
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::cancel()
 {
     DCHECK(isMainThread());
+    m_workerLoader = nullptr;
     if (!m_mainThreadLoader)
         return;
     m_mainThreadLoader->cancel();
     m_mainThreadLoader = nullptr;
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::didSendData(unsigned long long bytesSent, unsigned long long totalBytesToBeSent)
 {
     DCHECK(isMainThread());
     CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.get();
@@ skipping 34 matching lines @@
     DCHECK(isMainThread());
     CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.get();
     if (!workerLoader || !m_forwarder)
         return;
     m_forwarder->forwardTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerThreadableLoader::didReceiveCachedMetadata, workerLoader, passed(createVectorFromMemoryRegion(data, dataLength))));
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::didFinishLoading(unsigned long identifier, double finishTime)
 {
     DCHECK(isMainThread());
-    CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.get();
+    CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.release();
     if (!workerLoader || !m_forwarder)
         return;
     m_forwarder->forwardTaskWithDoneSignal(BLINK_FROM_HERE, createCrossThreadTask(&WorkerThreadableLoader::didFinishLoading, workerLoader, identifier, finishTime));
     m_forwarder = nullptr;
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::didFail(const ResourceError& error)
 {
     DCHECK(isMainThread());
-    CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.get();
+    CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.release();
     if (!workerLoader || !m_forwarder)
         return;
     m_forwarder->forwardTaskWithDoneSignal(BLINK_FROM_HERE, createCrossThreadTask(&WorkerThreadableLoader::didFail, workerLoader, error));
     m_forwarder = nullptr;
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::didFailAccessControlCheck(const ResourceError& error)
 {
     DCHECK(isMainThread());
-    CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.get();
+    CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.release();
     if (!workerLoader || !m_forwarder)
         return;
     m_forwarder->forwardTaskWithDoneSignal(BLINK_FROM_HERE, createCrossThreadTask(&WorkerThreadableLoader::didFailAccessControlCheck, workerLoader, error));
     m_forwarder = nullptr;
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::didFailRedirectCheck()
 {
     DCHECK(isMainThread());
-    CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.get();
+    CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.release();
     if (!workerLoader || !m_forwarder)
         return;
     m_forwarder->forwardTaskWithDoneSignal(BLINK_FROM_HERE, createCrossThreadTask(&WorkerThreadableLoader::didFailRedirectCheck, workerLoader));
     m_forwarder = nullptr;
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::didReceiveResourceTiming(const ResourceTimingInfo& info)
 {
     DCHECK(isMainThread());
     CrossThreadPersistent<WorkerThreadableLoader> workerLoader = m_workerLoader.get();
     if (!workerLoader || !m_forwarder)
         return;
     m_forwarder->forwardTask(BLINK_FROM_HERE, createCrossThreadTask(&WorkerThreadableLoader::didReceiveResourceTiming, workerLoader, info));
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::contextDestroyed()
 {
     DCHECK(isMainThread());
     if (m_forwarder) {
         m_forwarder->abort();
         m_forwarder = nullptr;
     }
-    m_workerLoader = nullptr;
     cancel();
 }
 
 DEFINE_TRACE(WorkerThreadableLoader::MainThreadLoaderHolder)
 {
     visitor->trace(m_forwarder);
     visitor->trace(m_mainThreadLoader);
     WorkerThreadLifecycleObserver::trace(visitor);
 }
 
@@ skipping 11 matching lines @@
     const ResourceLoaderOptions& originalResourceLoaderOptions)
 {
     DCHECK(isMainThread());
     ResourceLoaderOptions resourceLoaderOptions = originalResourceLoaderOptions;
     resourceLoaderOptions.requestInitiatorContext = WorkerContext;
     m_mainThreadLoader = DocumentThreadableLoader::create(document, this, options, resourceLoaderOptions);
     m_mainThreadLoader->start(ResourceRequest(request.get()));
 }
 
 } // namespace blink