Worker: Stop accessing ExecutionContext passed by ExecutionContextTask

third_party/WebKit/Source/core/workers/ThreadedWorkletMessagingProxy.cpp

Index: third_party/WebKit/Source/core/workers/ThreadedWorkletMessagingProxy.cpp
diff --git a/third_party/WebKit/Source/core/workers/ThreadedWorkletMessagingProxy.cpp b/third_party/WebKit/Source/core/workers/ThreadedWorkletMessagingProxy.cpp
index 25bbae9fba2340d5cfcae006ec1e51012d78c76b..e70ec8f2418dffd3ffbcf01396be1fd430b18f44 100644
--- a/third_party/WebKit/Source/core/workers/ThreadedWorkletMessagingProxy.cpp
+++ b/third_party/WebKit/Source/core/workers/ThreadedWorkletMessagingProxy.cpp
@@ -5,7 +5,6 @@
 #include "core/workers/ThreadedWorkletMessagingProxy.h"
 
 #include "bindings/core/v8/ScriptSourceCode.h"
-#include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/SecurityContext.h"
@@ -19,18 +18,6 @@
 
 namespace blink {
 
-namespace {
-
-void evaluateScriptOnWorkletGlobalScope(const String& source,
-                                        const KURL& scriptURL,
-                                        ExecutionContext* executionContext) {
-  WorkletGlobalScope* globalScope = toWorkletGlobalScope(executionContext);
-  globalScope->scriptController()->evaluate(
-      ScriptSourceCode(source, scriptURL));
-}
-
-}  // namespace
-
 ThreadedWorkletMessagingProxy::ThreadedWorkletMessagingProxy(
     ExecutionContext* executionContext)
     : ThreadedMessagingProxyBase(executionContext), m_weakPtrFactory(this) {
@@ -73,8 +60,10 @@ void ThreadedWorkletMessagingProxy::evaluateScript(
     const ScriptSourceCode& scriptSourceCode) {
   postTaskToWorkerGlobalScope(
       BLINK_FROM_HERE,
-      createCrossThreadTask(&evaluateScriptOnWorkletGlobalScope,
-                            scriptSourceCode.source(), scriptSourceCode.url()));
+      createCrossThreadTask(&ThreadedWorkletObjectProxy::evaluateScript,
+                            crossThreadUnretained(m_workletObjectProxy.get()),
+                            scriptSourceCode.source(), scriptSourceCode.url(),
+                            crossThreadUnretained(workerThread())));
 }
 
 void ThreadedWorkletMessagingProxy::terminateWorkletGlobalScope() {