Worklet: Move common code from Worker/WorkletGlobalScope to WorkerOrWorkletGlobalScope

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

Index: third_party/WebKit/Source/core/workers/WorkerOrWorkletGlobalScope.h
diff --git a/third_party/WebKit/Source/core/workers/WorkerOrWorkletGlobalScope.h b/third_party/WebKit/Source/core/workers/WorkerOrWorkletGlobalScope.h
index 2fd4a653f8c79f8bb316c129630bc9d53e156a33..62698815785163392f69ae8750acf06d941b7f36 100644
--- a/third_party/WebKit/Source/core/workers/WorkerOrWorkletGlobalScope.h
+++ b/third_party/WebKit/Source/core/workers/WorkerOrWorkletGlobalScope.h
@@ -16,11 +16,13 @@ class WorkerThread;
 
 class CORE_EXPORT WorkerOrWorkletGlobalScope : public ExecutionContext {
  public:
-  WorkerOrWorkletGlobalScope();
+  explicit WorkerOrWorkletGlobalScope(v8::Isolate*);
   virtual ~WorkerOrWorkletGlobalScope();
 
   // ExecutionContext
   bool IsWorkerOrWorkletGlobalScope() const final { return true; }
+  bool IsJSExecutionForbidden() const final;
+  void DisableEval(const String& error_message) final;
   void PostTask(
       TaskType,
       const WebTraceLocation&,
@@ -28,7 +30,6 @@ class CORE_EXPORT WorkerOrWorkletGlobalScope : public ExecutionContext {
       const String& task_name_for_instrumentation = g_empty_string) final;
 
   virtual ScriptWrappable* GetScriptWrappable() const = 0;
-  virtual WorkerOrWorkletScriptController* ScriptController() = 0;
 
   // Returns true when the WorkerOrWorkletGlobalScope is closing (e.g. via
   // WorkerGlobalScope#close() method). If this returns true, the worker is
@@ -38,7 +39,7 @@ class CORE_EXPORT WorkerOrWorkletGlobalScope : public ExecutionContext {
 
   // Should be called before destroying the global scope object. Allows
   // sub-classes to perform any cleanup needed.
-  virtual void Dispose() = 0;
+  virtual void Dispose();
 
   // Called from UseCounter to record API use in this execution context.
   void CountFeature(UseCounter::Feature);
@@ -51,6 +52,12 @@ class CORE_EXPORT WorkerOrWorkletGlobalScope : public ExecutionContext {
   // MainThreadWorkletGlobalScope) or after dispose() is called.
   virtual WorkerThread* GetThread() const = 0;
 
+  WorkerOrWorkletScriptController* ScriptController() {
+    return script_controller_.Get();
+  }
+
+  DECLARE_VIRTUAL_TRACE();
+
  protected:
   virtual void ReportFeature(UseCounter::Feature) = 0;
   virtual void ReportDeprecation(UseCounter::Feature) = 0;
@@ -58,6 +65,8 @@ class CORE_EXPORT WorkerOrWorkletGlobalScope : public ExecutionContext {
  private:
   void RunTask(std::unique_ptr<ExecutionContextTask>, bool is_instrumented);
 
+  Member<WorkerOrWorkletScriptController> script_controller_;
+
   // This is the set of features that this worker has used.
   BitVector used_features_;
 };