Worklets - Change inheritance heirarchy of WorkletGlobalScope

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

Index: third_party/WebKit/Source/core/workers/MainThreadWorkletGlobalScope.h
diff --git a/third_party/WebKit/Source/core/workers/MainThreadWorkletGlobalScope.h b/third_party/WebKit/Source/core/workers/MainThreadWorkletGlobalScope.h
index 494a19c056d5c6bdaed9cabb0891f636e804a32f..14d4478f89943f38648e6c171749a6a6df24b718 100644
--- a/third_party/WebKit/Source/core/workers/MainThreadWorkletGlobalScope.h
+++ b/third_party/WebKit/Source/core/workers/MainThreadWorkletGlobalScope.h
@@ -5,28 +5,40 @@
 #ifndef MainThreadWorkletGlobalScope_h
 #define MainThreadWorkletGlobalScope_h
 
+#include "core/CoreExport.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalFrameLifecycleObserver.h"
-#include "core/workers/WorkerOrWorkletGlobalScope.h"
+#include "core/workers/WorkletGlobalScope.h"
+#include "core/workers/WorkletGlobalScopeProxy.h"
 
 namespace blink {
 
+class ConsoleMessage;
 class LocalFrame;
 
-class CORE_EXPORT MainThreadWorkletGlobalScope : public WorkerOrWorkletGlobalScope, public LocalFrameLifecycleObserver {
+class CORE_EXPORT MainThreadWorkletGlobalScope : public WorkletGlobalScope, public WorkletGlobalScopeProxy, public LocalFrameLifecycleObserver {
 public:
+    ~MainThreadWorkletGlobalScope() override;
+    bool isMainThreadWorkletGlobalScope() const final { return true; }
+
+    // WorkletGlobalScopeProxy
+    void evaluateScript(const String& source, const KURL& scriptURL) final;
+    void terminateWorkletGlobalScope() final;
+
+    using LocalFrameLifecycleObserver::frame;
+    void addConsoleMessage(ConsoleMessage*) final;
+
     DEFINE_INLINE_VIRTUAL_TRACE()
     {
-        WorkerOrWorkletGlobalScope::trace(visitor);
+        WorkletGlobalScope::trace(visitor);
         LocalFrameLifecycleObserver::trace(visitor);
     }
 
 protected:
-    explicit MainThreadWorkletGlobalScope(LocalFrame* frame)
-        : LocalFrameLifecycleObserver(frame) { }
+    MainThreadWorkletGlobalScope(LocalFrame*, const KURL&, const String& userAgent, PassRefPtr<SecurityOrigin>, v8::Isolate*);
 };
 
-DEFINE_TYPE_CASTS(MainThreadWorkletGlobalScope, ExecutionContext, context, context->isWorkletGlobalScope(), context.isWorkletGlobalScope());
+DEFINE_TYPE_CASTS(MainThreadWorkletGlobalScope, ExecutionContext, context, context->isMainThreadWorkletGlobalScope(), context.isMainThreadWorkletGlobalScope());
 
 } // namespace blink