WorkerLoaderProxy: stop accessing cross-thread execution context

third_party/WebKit/Source/core/workers/ThreadedMessagingProxyBase.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef ThreadedMessagingProxyBase_h
 #define ThreadedMessagingProxyBase_h
 
 #include "core/CoreExport.h"
 #include "core/frame/UseCounter.h"
 #include "core/inspector/ConsoleTypes.h"
@@ skipping 26 matching lines @@
 
   void reportConsoleMessage(MessageSource,
                             MessageLevel,
                             const String& message,
                             std::unique_ptr<SourceLocation>);
   void postMessageToPageInspector(const String&);
 
   // 'virtual' for testing.
   virtual void workerThreadTerminated();
 
-  // Accessed from both the parent thread and the worker.
+  // Accessed only from the parent thread.
   ExecutionContext* getExecutionContext() const {
     return m_executionContext.get();
   }
 
   // Accessed from both the parent thread and the worker.
   ParentFrameTaskRunners* getParentFrameTaskRunners() {
     return m_parentFrameTaskRunners.get();
   }
 
   // Number of live messaging proxies, used by leak detection.
@@ skipping 16 matching lines @@
     return m_workerInspectorProxy.get();
   }
 
   // Returns true if this is called on the parent context thread.
   bool isParentContextThread() const;
 
   // WorkerLoaderProxyProvider
   // These methods are called on different threads to schedule loading
   // requests and to send callbacks back to WorkerGlobalScope.
   void postTaskToLoader(const WebTraceLocation&,
-                        std::unique_ptr<ExecutionContextTask>) override;
+                        std::unique_ptr<WTF::CrossThreadClosure>) override;
   void postTaskToWorkerGlobalScope(
       const WebTraceLocation&,
       std::unique_ptr<WTF::CrossThreadClosure>) override;
+  ExecutionContext* getLoaderExecutionContext() override;
 
  private:
   friend class InProcessWorkerMessagingProxyForTest;
   friend class ThreadedWorkletMessagingProxyForTest;
 
   void parentObjectDestroyedInternal();
 
-  // Accessed cross-thread when worker thread posts tasks to the parent;
-  // it is not ideal to have ExecutionContext be cross-thread accessible.
-  //
-  // TODO: try to drop the need for the CrossThreadPersistent<>.
-  CrossThreadPersistent<ExecutionContext> m_executionContext;
+  Persistent<ExecutionContext> m_executionContext;
   Persistent<WorkerInspectorProxy> m_workerInspectorProxy;
   // Accessed cross-thread when worker thread posts tasks to the parent.
   CrossThreadPersistent<ParentFrameTaskRunners> m_parentFrameTaskRunners;
 
   std::unique_ptr<WorkerThread> m_workerThread;
 
   RefPtr<WorkerLoaderProxy> m_loaderProxy;
 
   bool m_mayBeDestroyed;
   bool m_askedToTerminate;
 };
 
 }  // namespace blink
 
 #endif  // ThreadedMessagingProxyBase_h