WorkerLoaderProxy: stop accessing cross-thread execution context

third_party/WebKit/Source/web/WebEmbeddedWorkerImpl.cpp

 /*
  * Copyright (C) 2013 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 244 matching lines @@
       SourceLocation::create(message.url, message.lineNumber,
                              message.columnNumber, nullptr)));
 }
 
 void WebEmbeddedWorkerImpl::postMessageToPageInspector(const String& message) {
   m_workerInspectorProxy->dispatchMessageFromWorker(message);
 }
 
 void WebEmbeddedWorkerImpl::postTaskToLoader(
     const WebTraceLocation& location,
-    std::unique_ptr<ExecutionContextTask> task) {
-  // This cross-thread operation is brittle wrt per-thread heaps,
-  // posting a task to main-thread owned objects.
+    std::unique_ptr<WTF::CrossThreadClosure> task) {
   m_mainThreadTaskRunners->get(TaskType::Networking)
-      ->postTask(
-          BLINK_FROM_HERE,
-          crossThreadBind(
-              &ExecutionContextTask::performTaskIfContextIsValid,
-              WTF::passed(std::move(task)),
-              wrapCrossThreadWeakPersistent(m_mainFrame->frame()->document())));
+      ->postTask(BLINK_FROM_HERE, std::move(task));
 }
 
 void WebEmbeddedWorkerImpl::postTaskToWorkerGlobalScope(
     const WebTraceLocation& location,
     std::unique_ptr<WTF::CrossThreadClosure> task) {
   if (m_askedToTerminate || !m_workerThread)
     return;
   m_workerThread->postTask(location, std::move(task));
 }
 
+ExecutionContext* WebEmbeddedWorkerImpl::getLoaderExecutionContext() {
+  return m_mainFrame->frame()->document();
+}
+
 void WebEmbeddedWorkerImpl::prepareShadowPageForLoader() {
   // Create 'shadow page', which is never displayed and is used mainly to
   // provide a context for loading on the main thread.
   //
   // FIXME: This does mostly same as WebSharedWorkerImpl::initializeLoader.
   // This code, and probably most of the code in this class should be shared
   // with SharedWorker.
   DCHECK(!m_webView);
   m_webView = WebView::create(nullptr, WebPageVisibilityStateVisible);
   WebSettings* settings = m_webView->settings();
@@ skipping 182 matching lines @@
       *this, *document, *m_workerContextClient);
   m_loaderProxy = WorkerLoaderProxy::create(this);
   m_workerThread = ServiceWorkerThread::create(
       m_loaderProxy, *m_workerGlobalScopeProxy, m_mainThreadTaskRunners.get());
   m_workerThread->start(std::move(startupData));
   m_workerInspectorProxy->workerThreadCreated(document, m_workerThread.get(),
                                               scriptURL);
 }
 
 }  // namespace blink