Worklets - Change inheritance heirarchy of WorkletGlobalScope

third_party/WebKit/Source/modules/worklet/Worklet.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/worklet/Worklet.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
-#include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/inspector/InspectorInstrumentation.h"
-#include "modules/worklet/WorkletGlobalScope.h"
+#include "core/workers/WorkletGlobalScopeProxy.h"
 
 namespace blink {
 
 Worklet::Worklet(ExecutionContext* executionContext)
     : ActiveDOMObject(executionContext)
 {
 }
 
 ScriptPromise Worklet::import(ScriptState* scriptState, const String& url)
 {
@@ skipping 30 matching lines @@
 }
 
 void Worklet::onFinished(WorkerScriptLoader* scriptLoader, ScriptPromiseResolver* resolver)
 {
     if (scriptLoader->failed()) {
         resolver->reject(DOMException::create(NetworkError));
     } else {
         // TODO(ikilpatrick): Worklets don't have the same error behaviour
         // as workers, etc. For a SyntaxError we should reject, however if
         // the script throws a normal error, resolve. For now just resolve.
-        workletGlobalScope()->scriptController()->evaluate(ScriptSourceCode(scriptLoader->script(), scriptLoader->url()));
-        InspectorInstrumentation::scriptImported(workletGlobalScope(), scriptLoader->identifier(), scriptLoader->script());
+        workletGlobalScopeProxy()->evaluateScript(scriptLoader->script(), scriptLoader->url());
+        InspectorInstrumentation::scriptImported(getExecutionContext(), scriptLoader->identifier(), scriptLoader->script());
         resolver->resolve();
     }
 
     size_t index = m_scriptLoaders.find(scriptLoader);
 
     ASSERT(index != kNotFound);
     ASSERT(m_resolvers[index] == resolver);
 
     m_scriptLoaders.remove(index);
     m_resolvers.remove(index);
 }
 
 void Worklet::stop()
 {
-    workletGlobalScope()->dispose();
+    workletGlobalScopeProxy()->terminateWorkletGlobalScope();
 
     for (auto scriptLoader : m_scriptLoaders) {
         scriptLoader->cancel();
     }
 }
 
 DEFINE_TRACE(Worklet)
 {
     visitor->trace(m_resolvers);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink