(WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper

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

Index: third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.cpp
diff --git a/third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.cpp b/third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.cpp
index f74e8114b940c4f198e632705b4e6f3c58a8b760..568117587c6c12bfa09cbbb6a1692728e0faf7d3 100644
--- a/third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.cpp
+++ b/third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.cpp
@@ -4,29 +4,27 @@
 
 #include "core/workers/ThreadedObjectProxyBase.h"
 
+#include <memory>
 #include "core/dom/ExecutionContext.h"
+#include "core/dom/TaskRunnerHelper.h"
 #include "core/inspector/ConsoleMessage.h"
-#include "core/workers/ParentFrameTaskRunners.h"
 #include "core/workers/ThreadedMessagingProxyBase.h"
 #include "platform/CrossThreadFunctional.h"
 #include "platform/WebTaskRunner.h"
 #include "wtf/Functional.h"
 #include "wtf/PtrUtil.h"
-#include <memory>
 
 namespace blink {
 
 void ThreadedObjectProxyBase::countFeature(UseCounter::Feature feature) {
-  getParentFrameTaskRunners()
-      ->get(TaskType::UnspecedTimer)
+  FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
       ->postTask(BLINK_FROM_HERE,
                  crossThreadBind(&ThreadedMessagingProxyBase::countFeature,
                                  messagingProxyWeakPtr(), feature));
 }
 
 void ThreadedObjectProxyBase::countDeprecation(UseCounter::Feature feature) {
-  getParentFrameTaskRunners()
-      ->get(TaskType::UnspecedTimer)
+  FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
       ->postTask(BLINK_FROM_HERE,
                  crossThreadBind(&ThreadedMessagingProxyBase::countDeprecation,
                                  messagingProxyWeakPtr(), feature));
@@ -36,8 +34,7 @@ void ThreadedObjectProxyBase::reportConsoleMessage(MessageSource source,
                                                    MessageLevel level,
                                                    const String& message,
                                                    SourceLocation* location) {
-  getParentFrameTaskRunners()
-      ->get(TaskType::UnspecedTimer)
+  FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
       ->postTask(
           BLINK_FROM_HERE,
           crossThreadBind(&ThreadedMessagingProxyBase::reportConsoleMessage,
@@ -49,17 +46,20 @@ void ThreadedObjectProxyBase::postMessageToPageInspector(
     const String& message) {
   // The TaskType of Inspector tasks need to be Unthrottled because they need to
   // run even on a suspended page.
-  getParentFrameTaskRunners()
-      ->get(TaskType::Unthrottled)
+  FrameTaskRunnerHelper::get(TaskType::Unthrottled, m_globalScope.get())
       ->postTask(BLINK_FROM_HERE,
                  crossThreadBind(
                      &ThreadedMessagingProxyBase::postMessageToPageInspector,
                      messagingProxyWeakPtr(), message));
 }
 
+void ThreadedObjectProxyBase::didCreateWorkerGlobalScope(
+    WorkerOrWorkletGlobalScope* globalScope) {
+  m_globalScope = globalScope;
+}
+
 void ThreadedObjectProxyBase::didCloseWorkerGlobalScope() {
-  getParentFrameTaskRunners()
-      ->get(TaskType::UnspecedTimer)
+  FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
       ->postTask(
           BLINK_FROM_HERE,
           crossThreadBind(&ThreadedMessagingProxyBase::terminateGlobalScope,
@@ -68,20 +68,13 @@ void ThreadedObjectProxyBase::didCloseWorkerGlobalScope() {
 
 void ThreadedObjectProxyBase::didTerminateWorkerThread() {
   // This will terminate the MessagingProxy.
-  getParentFrameTaskRunners()
-      ->get(TaskType::UnspecedTimer)
+  FrameTaskRunnerHelper::get(TaskType::UnspecedTimer, m_globalScope.get())
       ->postTask(
           BLINK_FROM_HERE,
           crossThreadBind(&ThreadedMessagingProxyBase::workerThreadTerminated,
                           messagingProxyWeakPtr()));
+  // TODO
+  m_globalScope = nullptr;
 }
 
-ParentFrameTaskRunners* ThreadedObjectProxyBase::getParentFrameTaskRunners() {
-  return m_parentFrameTaskRunners.get();
-}
-
-ThreadedObjectProxyBase::ThreadedObjectProxyBase(
-    ParentFrameTaskRunners* parentFrameTaskRunners)
-    : m_parentFrameTaskRunners(parentFrameTaskRunners) {}
-
 }  // namespace blink