WorkerLoaderProxy: stop accessing cross-thread execution context

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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/loader/WorkerThreadableLoader.h"
 
 #include "core/dom/Document.h"
-#include "core/dom/ExecutionContextTask.h"
 #include "core/loader/DocumentThreadableLoader.h"
 #include "core/timing/WorkerGlobalScopePerformance.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerLoaderProxy.h"
 #include "platform/CrossThreadFunctional.h"
 #include "platform/heap/SafePoint.h"
 #include "platform/network/ResourceError.h"
 #include "platform/network/ResourceRequest.h"
 #include "platform/network/ResourceResponse.h"
 #include "platform/network/ResourceTimingInfo.h"
@@ skipping 184 matching lines @@
         m_workerGlobalScope->outgoingReferrer()));
   }
 
   DCHECK(!isMainThread());
   RefPtr<WaitableEventWithTasks> eventWithTasks;
   if (m_blockingBehavior == LoadSynchronously)
     eventWithTasks = WaitableEventWithTasks::create();
 
   m_workerLoaderProxy->postTaskToLoader(
       BLINK_FROM_HERE,
-      createCrossThreadTask(
+      crossThreadBind(
           &MainThreadLoaderHolder::createAndStart,
           wrapCrossThreadPersistent(this), m_workerLoaderProxy,
           wrapCrossThreadPersistent(
               m_workerGlobalScope->thread()->getWorkerThreadLifecycleContext()),
           request, m_threadableLoaderOptions, m_resourceLoaderOptions,
           eventWithTasks));
 
   if (m_blockingBehavior == LoadAsynchronously)
     return;
 
@@ skipping 15 matching lines @@
   }
 }
 
 void WorkerThreadableLoader::overrideTimeout(
     unsigned long timeoutMilliseconds) {
   DCHECK(!isMainThread());
   if (!m_mainThreadLoaderHolder)
     return;
   m_workerLoaderProxy->postTaskToLoader(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&MainThreadLoaderHolder::overrideTimeout,
-                            m_mainThreadLoaderHolder, timeoutMilliseconds));
+      crossThreadBind(&MainThreadLoaderHolder::overrideTimeout,
+                      m_mainThreadLoaderHolder, timeoutMilliseconds));
 }
 
 void WorkerThreadableLoader::cancel() {
   DCHECK(!isMainThread());
   if (m_mainThreadLoaderHolder) {
     m_workerLoaderProxy->postTaskToLoader(
-        BLINK_FROM_HERE, createCrossThreadTask(&MainThreadLoaderHolder::cancel,
-                                               m_mainThreadLoaderHolder));
+        BLINK_FROM_HERE, crossThreadBind(&MainThreadLoaderHolder::cancel,
+                                         m_mainThreadLoaderHolder));
     m_mainThreadLoaderHolder = nullptr;
   }
 
   if (!m_client)
     return;
 
   // 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
   // clearClient() call ensures that.
   ResourceError error(String(), 0, String(), String());
   error.setIsCancellation(true);
   didFail(error);
   DCHECK(!m_client);
 }
 
 void WorkerThreadableLoader::didStart(
     MainThreadLoaderHolder* mainThreadLoaderHolder) {
   DCHECK(!isMainThread());
   DCHECK(!m_mainThreadLoaderHolder);
   DCHECK(mainThreadLoaderHolder);
   if (!m_client) {
     // The thread is terminating.
     m_workerLoaderProxy->postTaskToLoader(
-        BLINK_FROM_HERE, createCrossThreadTask(&MainThreadLoaderHolder::cancel,
-                                               wrapCrossThreadPersistent(
-                                                   mainThreadLoaderHolder)));
+        BLINK_FROM_HERE,
+        crossThreadBind(&MainThreadLoaderHolder::cancel,
+                        wrapCrossThreadPersistent(mainThreadLoaderHolder)));
     return;
   }
 
   m_mainThreadLoaderHolder = mainThreadLoaderHolder;
 }
 
 void WorkerThreadableLoader::didSendData(
     unsigned long long bytesSent,
     unsigned long long totalBytesToBeSent) {
   DCHECK(!isMainThread());
@@ skipping 103 matching lines @@
   ThreadableLoader::trace(visitor);
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::createAndStart(
     WorkerThreadableLoader* workerLoader,
     PassRefPtr<WorkerLoaderProxy> passLoaderProxy,
     WorkerThreadLifecycleContext* workerThreadLifecycleContext,
     std::unique_ptr<CrossThreadResourceRequestData> request,
     const ThreadableLoaderOptions& options,
     const ResourceLoaderOptions& resourceLoaderOptions,
-    PassRefPtr<WaitableEventWithTasks> eventWithTasks,
-    ExecutionContext* executionContext) {
+    PassRefPtr<WaitableEventWithTasks> eventWithTasks) {
   DCHECK(isMainThread());
   TaskForwarder* forwarder;
   RefPtr<WorkerLoaderProxy> loaderProxy = passLoaderProxy;
+  ExecutionContext* loaderContext = loaderProxy->getLoaderExecutionContext();
+  if (!loaderContext)
+    return;
   if (eventWithTasks)
     forwarder = new SyncTaskForwarder(std::move(eventWithTasks));
   else
     forwarder = new AsyncTaskForwarder(loaderProxy);
 
   MainThreadLoaderHolder* mainThreadLoaderHolder =
       new MainThreadLoaderHolder(forwarder, workerThreadLifecycleContext);
   if (mainThreadLoaderHolder->wasContextDestroyedBeforeObserverCreation()) {
     // The thread is already terminating.
     forwarder->abort();
     mainThreadLoaderHolder->m_forwarder = nullptr;
     return;
   }
   mainThreadLoaderHolder->m_workerLoader = workerLoader;
   forwarder->forwardTask(
       BLINK_FROM_HERE,
       crossThreadBind(&WorkerThreadableLoader::didStart,
                       wrapCrossThreadPersistent(workerLoader),
                       wrapCrossThreadPersistent(mainThreadLoaderHolder)));
-  mainThreadLoaderHolder->start(*toDocument(executionContext),
-                                std::move(request), options,
-                                resourceLoaderOptions);
+  mainThreadLoaderHolder->start(
+      *toDocument(loaderProxy->getLoaderExecutionContext()), std::move(request),

[yhirano, 2017/02/23 05:55:58]

loaderContext

[kinuko, 2017/02/23 07:35:29]

Done.

+      options, resourceLoaderOptions);
 }
 
 WorkerThreadableLoader::MainThreadLoaderHolder::~MainThreadLoaderHolder() {
   DCHECK(isMainThread());
   DCHECK(!m_workerLoader);
 }
 
 void WorkerThreadableLoader::MainThreadLoaderHolder::overrideTimeout(
     unsigned long timeoutMilliseconds) {
   DCHECK(isMainThread());
@@ skipping 193 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