Worklets - Change inheritance heirarchy of WorkletGlobalScope

third_party/WebKit/Source/core/workers/WorkletGlobalScope.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/WorkletGlobalScope.h"
+#include "core/workers/WorkletGlobalScope.h"
 
 #include "bindings/core/v8/SourceLocation.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
-#include "core/frame/FrameConsole.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/MainThreadDebugger.h"
 
 namespace blink {
 
-WorkletGlobalScope::WorkletGlobalScope(LocalFrame* frame, const KURL& url, const String& userAgent, PassRefPtr<SecurityOrigin> securityOrigin, v8::Isolate* isolate)
-    : MainThreadWorkletGlobalScope(frame)
-    , m_url(url)
+WorkletGlobalScope::WorkletGlobalScope(const KURL& url, const String& userAgent, PassRefPtr<SecurityOrigin> securityOrigin, v8::Isolate* isolate)
+    : m_url(url)
     , m_userAgent(userAgent)
     , m_scriptController(WorkerOrWorkletScriptController::create(this, isolate))
 {
     setSecurityOrigin(securityOrigin);
 }
 
 WorkletGlobalScope::~WorkletGlobalScope()
 {
 }
 
 void WorkletGlobalScope::dispose()
 {
     stopActiveDOMObjects();
 
-    ASSERT(m_scriptController);
+    DCHECK(m_scriptController);
     m_scriptController->willScheduleExecutionTermination();
     m_scriptController->dispose();
     m_scriptController.clear();
 }
 
 v8::Local<v8::Object> WorkletGlobalScope::wrap(v8::Isolate*, v8::Local<v8::Object> creationContext)
 {
     // WorkletGlobalScope must never be wrapped with wrap method. The global
     // object of ECMAScript environment is used as the wrapper.
     RELEASE_NOTREACHED();
@@ skipping 20 matching lines @@
         return true;
     errorMessage = getSecurityOrigin()->isPotentiallyTrustworthyErrorMessage();
     return false;
 }
 
 void WorkletGlobalScope::reportBlockedScriptExecutionToInspector(const String& directiveText)
 {
     InspectorInstrumentation::scriptExecutionBlockedByCSP(this, directiveText);
 }
 
-void WorkletGlobalScope::addConsoleMessage(ConsoleMessage* consoleMessage)
-{
-    frame()->console().addMessage(consoleMessage);
-}
-
 void WorkletGlobalScope::logExceptionToConsole(const String& errorMessage, PassOwnPtr<SourceLocation> location)
 {
     ConsoleMessage* consoleMessage = ConsoleMessage::create(JSMessageSource, ErrorMessageLevel, errorMessage, std::move(location));
     addConsoleMessage(consoleMessage);
 }
 
 KURL WorkletGlobalScope::virtualCompleteURL(const String& url) const
 {
     // Always return a null URL when passed a null string.
     // TODO(ikilpatrick): Should we change the KURL constructor to have this
     // behavior?
     if (url.isNull())
         return KURL();
     // Always use UTF-8 in Worklets.
     return KURL(m_url, url);
 }
 
 DEFINE_TRACE(WorkletGlobalScope)
 {
     visitor->trace(m_scriptController);
     ExecutionContext::trace(visitor);
     SecurityContext::trace(visitor);
-    MainThreadWorkletGlobalScope::trace(visitor);
+    WorkerOrWorkletGlobalScope::trace(visitor);
 }
 
 } // namespace blink