refactor: add v8::Isolate* arg to NodeBindings::CreateEnvironment()

electron · codebytere · Jul 21, 2025 · Jul 11, 2025 · Jul 15, 2025 · Jul 15, 2025
commit 8a4f912ee0ae0dfb6bad194f1372c0a85f2e1d9e
diff --git a/shell/browser/electron_browser_main_parts.cc b/shell/browser/electron_browser_main_parts.cc
@@ -237,8 +237,8 @@ void ElectronBrowserMainParts::PostEarlyInitialization() {
   node_bindings_->Initialize(js_env_->isolate()->GetCurrentContext());
   // Create the global environment.
   node_env_ = node_bindings_->CreateEnvironment(
-      js_env_->isolate()->GetCurrentContext(), js_env_->platform(),
-      js_env_->max_young_generation_size_in_bytes());
+      js_env_->isolate(), js_env_->isolate()->GetCurrentContext(),
+      js_env_->platform(), js_env_->max_young_generation_size_in_bytes());
 
   node_env_->set_trace_sync_io(node_env_->options()->trace_sync_io);
 

diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
@@ -641,6 +641,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> context) {
 }
 
 std::shared_ptr<node::Environment> NodeBindings::CreateEnvironment(
+    v8::Isolate* isolate,
     v8::Local<v8::Context> context,
     node::MultiIsolatePlatform* platform,
     size_t max_young_generation_size,
@@ -664,7 +665,6 @@ std::shared_ptr<node::Environment> NodeBindings::CreateEnvironment(
       break;
   }
 
-  v8::Isolate* isolate = v8::Isolate::GetCurrent();
   gin_helper::Dictionary global(isolate, context->Global());
 
   if (browser_env_ == BrowserEnvironment::kBrowser) {
@@ -832,13 +832,14 @@ std::shared_ptr<node::Environment> NodeBindings::CreateEnvironment(
 }
 
 std::shared_ptr<node::Environment> NodeBindings::CreateEnvironment(
+    v8::Isolate* const isolate,
     v8::Local<v8::Context> context,
     node::MultiIsolatePlatform* platform,
     size_t max_young_generation_size,
     std::optional<base::RepeatingCallback<void()>> on_app_code_ready) {
-  return CreateEnvironment(context, platform, max_young_generation_size,
-                           ElectronCommandLine::AsUtf8(), {},
-                           on_app_code_ready);
+  return CreateEnvironment(
+      isolate, context, platform, max_young_generation_size,
+      ElectronCommandLine::AsUtf8(), {}, on_app_code_ready);
 }
 
 void NodeBindings::LoadEnvironment(node::Environment* env) {

diff --git a/shell/common/node_bindings.h b/shell/common/node_bindings.h
@@ -131,6 +131,7 @@ class NodeBindings {
 
   // Create the environment and load node.js.
   std::shared_ptr<node::Environment> CreateEnvironment(
+      v8::Isolate* isolate,
       v8::Local<v8::Context> context,
       node::MultiIsolatePlatform* platform,
       size_t max_young_generation_size,
@@ -140,6 +141,7 @@ class NodeBindings {
           std::nullopt);
 
   std::shared_ptr<node::Environment> CreateEnvironment(
+      v8::Isolate* isolate,
       v8::Local<v8::Context> context,
       node::MultiIsolatePlatform* platform,
       size_t max_young_generation_size = 0,

diff --git a/shell/renderer/electron_renderer_client.cc b/shell/renderer/electron_renderer_client.cc
@@ -125,16 +125,16 @@ void ElectronRendererClient::DidCreateScriptContext(
   render_frame->GetWebFrame()->GetDocumentLoader()->SetDefersLoading(
       blink::LoaderFreezeMode::kStrict);
 
+  v8::Isolate* const isolate = renderer_context->GetIsolate();
   std::shared_ptr<node::Environment> env = node_bindings_->CreateEnvironment(
-      renderer_context, nullptr, 0,
+      isolate, renderer_context, nullptr, 0,
       base::BindRepeating(&ElectronRendererClient::UndeferLoad,
                           base::Unretained(this), render_frame));
 
   // We need to use the Blink implementation of fetch in the renderer process
   // Node.js deletes the global fetch function when their fetch implementation
   // is disabled, so we need to save and re-add it after the Node.js environment
   // is loaded. See corresponding change in node/init.ts.
-  v8::Isolate* isolate = env->isolate();
   v8::Local<v8::Object> global = renderer_context->Global();
 
   std::vector<std::string> keys = {"fetch",   "Response", "FormData",

diff --git a/shell/renderer/web_worker_observer.cc b/shell/renderer/web_worker_observer.cc
@@ -49,7 +49,7 @@ WebWorkerObserver::~WebWorkerObserver() = default;
 void WebWorkerObserver::WorkerScriptReadyForEvaluation(
     v8::Local<v8::Context> worker_context) {
   v8::Context::Scope context_scope(worker_context);
-  auto* isolate = worker_context->GetIsolate();
+  v8::Isolate* const isolate = worker_context->GetIsolate();
   v8::MicrotasksScope microtasks_scope(
       worker_context, v8::MicrotasksScope::kDoNotRunMicrotasks);
 
@@ -66,7 +66,7 @@ void WebWorkerObserver::WorkerScriptReadyForEvaluation(
   v8::Maybe<bool> initialized = node::InitializeContext(worker_context);
   CHECK(!initialized.IsNothing() && initialized.FromJust());
   std::shared_ptr<node::Environment> env =
-      node_bindings_->CreateEnvironment(worker_context, nullptr);
+      node_bindings_->CreateEnvironment(isolate, worker_context, nullptr);
 
   // We need to use the Blink implementation of fetch in web workers
   // Node.js deletes the global fetch function when their fetch implementation

diff --git a/shell/services/node/node_service.cc b/shell/services/node/node_service.cc
@@ -136,9 +136,9 @@ void NodeService::Initialize(
 
   // Create the global environment.
   node_env_ = node_bindings_->CreateEnvironment(
-      js_env_->isolate()->GetCurrentContext(), js_env_->platform(),
-      js_env_->max_young_generation_size_in_bytes(), params->args,
-      params->exec_args);
+      js_env_->isolate(), js_env_->isolate()->GetCurrentContext(),
+      js_env_->platform(), js_env_->max_young_generation_size_in_bytes(),
+      params->args, params->exec_args);
 
   // Override the default handler set by NodeBindings.
   node_env_->isolate()->SetFatalErrorHandler(V8FatalErrorCallback);