WorkerLoaderProxy: stop accessing cross-thread execution context

third_party/WebKit/Source/web/WebSharedWorkerImpl.cpp

 /*
  * 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 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 "web/WebSharedWorkerImpl.h"
 
 #include "core/dom/Document.h"
-#include "core/dom/ExecutionContextTask.h"
 #include "core/events/MessageEvent.h"
 #include "core/html/HTMLFormElement.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/loader/FrameLoadRequest.h"
 #include "core/loader/FrameLoader.h"
 #include "core/page/Page.h"
 #include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/SharedWorkerGlobalScope.h"
 #include "core/workers/SharedWorkerThread.h"
@@ skipping 251 matching lines @@
 void WebSharedWorkerImpl::didTerminateWorkerThreadOnMainThread() {
   m_client->workerContextDestroyed();
   // The lifetime of this proxy is controlled by the worker context.
   delete this;
 }
 
 // WorkerLoaderProxyProvider -------------------------------------------------
 
 void WebSharedWorkerImpl::postTaskToLoader(
     const WebTraceLocation& location,
-    std::unique_ptr<ExecutionContextTask> task) {
+    std::unique_ptr<WTF::CrossThreadClosure> task) {
   m_parentFrameTaskRunners->get(TaskType::Networking)
-      ->postTask(FROM_HERE,
-                 crossThreadBind(
-                     &ExecutionContextTask::performTaskIfContextIsValid,
-                     WTF::passed(std::move(task)),
-                     wrapCrossThreadWeakPersistent(m_loadingDocument.get())));
+      ->postTask(FROM_HERE, std::move(task));
 }
 
 void WebSharedWorkerImpl::postTaskToWorkerGlobalScope(
     const WebTraceLocation& location,
     std::unique_ptr<WTF::CrossThreadClosure> task) {
   m_workerThread->postTask(location, std::move(task));
 }
 
+ExecutionContext* WebSharedWorkerImpl::getLoaderExecutionContext() {
+  return m_loadingDocument.get();
+}
+
 void WebSharedWorkerImpl::connect(WebMessagePortChannel* webChannel) {
   DCHECK(isMainThread());
   workerThread()->postTask(
       BLINK_FROM_HERE,
       crossThreadBind(&WebSharedWorkerImpl::connectTask,
                       WTF::crossThreadUnretained(this),
                       WTF::passed(WebMessagePortChannelUniquePtr(webChannel))));
 }
 
 void WebSharedWorkerImpl::connectTask(WebMessagePortChannelUniquePtr channel) {
@@ skipping 135 matching lines @@
   if (devtoolsAgent)
     devtoolsAgent->dispatchOnInspectorBackend(sessionId, callId, method,
                                               message);
 }
 
 WebSharedWorker* WebSharedWorker::create(WebSharedWorkerClient* client) {
   return new WebSharedWorkerImpl(client);
 }
 
 }  // namespace blink