(WIP) Worker: Merge ParentFrameTaskRunners into TaskRunnerHelper

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

Index: third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.h
diff --git a/third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.h b/third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.h
index afa34a77ccbe5eb957813062a2d50b568f577475..4ad6d2fbabc165ab7cfbec52b3037503fe4a4eb3 100644
--- a/third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.h
+++ b/third_party/WebKit/Source/core/workers/ThreadedObjectProxyBase.h
@@ -8,11 +8,11 @@
 #include "bindings/core/v8/SourceLocation.h"
 #include "core/CoreExport.h"
 #include "core/dom/MessagePort.h"
+#include "core/workers/WorkerOrWorkletGlobalScope.h"
 #include "core/workers/WorkerReportingProxy.h"
 
 namespace blink {
 
-class ParentFrameTaskRunners;
 class ThreadedMessagingProxyBase;
 
 // A proxy to talk to the parent object. This object is created and destroyed on
@@ -24,6 +24,7 @@ class CORE_EXPORT ThreadedObjectProxyBase : public WorkerReportingProxy {
   WTF_MAKE_NONCOPYABLE(ThreadedObjectProxyBase);
 
  public:
+  ThreadedObjectProxyBase() = default;
   ~ThreadedObjectProxyBase() override = default;
 
   void reportPendingActivity(bool hasPendingActivity);
@@ -36,18 +37,14 @@ class CORE_EXPORT ThreadedObjectProxyBase : public WorkerReportingProxy {
                             const String& message,
                             SourceLocation*) override;
   void postMessageToPageInspector(const String&) override;
+  void didCreateWorkerGlobalScope(WorkerOrWorkletGlobalScope*) override;
   void didCloseWorkerGlobalScope() override;
   void didTerminateWorkerThread() override;
 
  protected:
-  explicit ThreadedObjectProxyBase(ParentFrameTaskRunners*);
   virtual WeakPtr<ThreadedMessagingProxyBase> messagingProxyWeakPtr() = 0;
-  ParentFrameTaskRunners* getParentFrameTaskRunners();
 
- private:
-  // Used to post a task to ThreadedMessagingProxyBase on the parent context
-  // thread.
-  CrossThreadPersistent<ParentFrameTaskRunners> m_parentFrameTaskRunners;
+  CrossThreadPersistent<WorkerOrWorkletGlobalScope> m_globalScope;
 };
 
 }  // namespace blink