Move ScriptState::GetExecutionContext (Part 3)

third_party/WebKit/Source/bindings/core/v8/V8Initializer.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 29 matching lines @@
 #include "bindings/core/v8/V8ErrorEvent.h"
 #include "bindings/core/v8/V8ErrorHandler.h"
 #include "bindings/core/v8/V8GCController.h"
 #include "bindings/core/v8/V8IdleTaskRunner.h"
 #include "bindings/core/v8/V8Location.h"
 #include "bindings/core/v8/V8PerContextData.h"
 #include "bindings/core/v8/V8PrivateProperty.h"
 #include "bindings/core/v8/V8Window.h"
 #include "bindings/core/v8/WorkerOrWorkletScriptController.h"
 #include "core/dom/Document.h"
+#include "core/dom/ExecutionContext.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/csp/ContentSecurityPolicy.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/inspector/MainThreadDebugger.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "platform/EventDispatchForbiddenScope.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "platform/instrumentation/tracing/TraceEvent.h"
 #include "platform/loader/fetch/AccessControlStatus.h"
@@ skipping 99 matching lines @@
   v8::Isolate* isolate = v8::Isolate::GetCurrent();
 
   if (isolate->GetEnteredContext().IsEmpty())
     return;
 
   // If called during context initialization, there will be no entered context.
   ScriptState* script_state = ScriptState::Current(isolate);
   if (!script_state->ContextIsValid())
     return;
 
-  ExecutionContext* context = script_state->GetExecutionContext();
+  ExecutionContext* context = ExecutionContext::From(script_state);
   std::unique_ptr<SourceLocation> location =
       SourceLocation::FromMessage(isolate, message, context);
 
   if (message->ErrorLevel() != v8::Isolate::kMessageError) {
     context->AddConsoleMessage(ConsoleMessage::Create(
         kJSMessageSource,
         MessageLevelFromNonFatalErrorLevel(message->ErrorLevel()),
         ToCoreStringWithNullCheck(message->Get()), std::move(location)));
     return;
   }
@@ skipping 37 matching lines @@
                                  ScriptState* script_state) {
   if (data.GetEvent() == v8::kPromiseHandlerAddedAfterReject) {
     rejected_promises.HandlerAdded(data);
     return;
   }
 
   ASSERT(data.GetEvent() == v8::kPromiseRejectWithNoHandler);
 
   v8::Local<v8::Promise> promise = data.GetPromise();
   v8::Isolate* isolate = promise->GetIsolate();
-  ExecutionContext* context = script_state->GetExecutionContext();
+  ExecutionContext* context = ExecutionContext::From(script_state);
 
   v8::Local<v8::Value> exception = data.GetValue();
   if (V8DOMWrapper::IsWrapper(isolate, exception)) {
     // Try to get the stack & location from a wrapped exception object (e.g.
     // DOMException).
     ASSERT(exception->IsObject());
     auto private_error = V8PrivateProperty::GetDOMExceptionError(isolate);
     v8::Local<v8::Value> error =
         private_error.GetOrUndefined(exception.As<v8::Object>());
     if (!error->IsUndefined())
@@ skipping 49 matching lines @@
 
 static void PromiseRejectHandlerInWorker(v8::PromiseRejectMessage data) {
   v8::Local<v8::Promise> promise = data.GetPromise();
 
   // Bail out if called during context initialization.
   v8::Isolate* isolate = promise->GetIsolate();
   ScriptState* script_state = ScriptState::Current(isolate);
   if (!script_state->ContextIsValid())
     return;
 
-  ExecutionContext* execution_context = script_state->GetExecutionContext();
+  ExecutionContext* execution_context = ExecutionContext::From(script_state);
   if (!execution_context)
     return;
 
   ASSERT(execution_context->IsWorkerGlobalScope());
   WorkerOrWorkletScriptController* script_controller =
       ToWorkerGlobalScope(execution_context)->ScriptController();
   ASSERT(script_controller);
 
   PromiseRejectHandler(data, *script_controller->GetRejectedPromises(),
                        script_state);
@@ skipping 212 matching lines @@
     return;
 
   // Exceptions that occur in error handler should be ignored since in that case
   // WorkerGlobalScope::dispatchErrorEvent will send the exception to the worker
   // object.
   if (per_isolate_data->IsReportingException())
     return;
 
   per_isolate_data->SetReportingException(true);
 
-  ExecutionContext* context = script_state->GetExecutionContext();
+  ExecutionContext* context = ExecutionContext::From(script_state);
   std::unique_ptr<SourceLocation> location =
       SourceLocation::FromMessage(isolate, message, context);
 
   if (message->ErrorLevel() != v8::Isolate::kMessageError) {
     context->AddConsoleMessage(ConsoleMessage::Create(
         kJSMessageSource,
         MessageLevelFromNonFatalErrorLevel(message->ErrorLevel()),
         ToCoreStringWithNullCheck(message->Get()), std::move(location)));
     return;
   }
 
   ErrorEvent* event =
       ErrorEvent::Create(ToCoreStringWithNullCheck(message->Get()),
                          std::move(location), &script_state->World());
 
   AccessControlStatus cors_status = message->IsSharedCrossOrigin()
                                         ? kSharableCrossOrigin
                                         : kNotSharableCrossOrigin;
 
   // If execution termination has been triggered as part of constructing
   // the error event from the v8::Message, quietly leave.
   if (!isolate->IsExecutionTerminating()) {
     V8ErrorHandler::StoreExceptionOnErrorEventWrapper(
         script_state, event, data, script_state->GetContext()->Global());
-    script_state->GetExecutionContext()->DispatchErrorEvent(event, cors_status);
+    ExecutionContext::From(script_state)
+        ->DispatchErrorEvent(event, cors_status);
   }
 
   per_isolate_data->SetReportingException(false);
 }
 
 // Stack size for workers is limited to 500KB because default stack size for
 // secondary threads is 512KB on Mac OS X. See GetDefaultThreadStackSize() in
 // base/threading/platform_thread_mac.mm for details.
 static const int kWorkerMaxStackSize = 500 * 1024;
 
@@ skipping 12 matching lines @@
           v8::Isolate::kMessageLog);
   isolate->SetFatalErrorHandler(ReportFatalErrorInWorker);
 
   uint32_t here;
   isolate->SetStackLimit(reinterpret_cast<uintptr_t>(&here) -
                          kWorkerMaxStackSize);
   isolate->SetPromiseRejectCallback(PromiseRejectHandlerInWorker);
 }
 
 }  // namespace blink