src: update std::vector<v8::Local<T>> to use v8::LocalVector<T>

codebytere · codebytere · commit 4aa4a1e6407d · 2025-05-26T16:18:16.000+02:00
nodejs/node#57578
diff --git a/shell/common/node_bindings.cc b/shell/common/node_bindings.cc
@@ -1001,11 +1001,10 @@ void OnNodePreload(node::Environment* env,
   }
 
   // Execute lib/node/init.ts.
-  std::vector<v8::Local<v8::String>> bundle_params = {
-      node::FIXED_ONE_BYTE_STRING(env->isolate(), "process"),
-      node::FIXED_ONE_BYTE_STRING(env->isolate(), "require"),
-  };
-  std::vector<v8::Local<v8::Value>> bundle_args = {process, require};
+  v8::LocalVector<v8::String> bundle_params(
+      env->isolate(), {node::FIXED_ONE_BYTE_STRING(env->isolate(), "process"),
+                       node::FIXED_ONE_BYTE_STRING(env->isolate(), "require")});
+  v8::LocalVector<v8::Value> bundle_args(env->isolate(), {process, require});
   electron::util::CompileAndCall(env->context(), "electron/js2c/node_init",
                                  &bundle_params, &bundle_args);
 }
diff --git a/shell/common/node_util.cc b/shell/common/node_util.cc
@@ -23,8 +23,8 @@ namespace electron::util {
 v8::MaybeLocal<v8::Value> CompileAndCall(
     v8::Local<v8::Context> context,
     const char* id,
-    std::vector<v8::Local<v8::String>>* parameters,
-    std::vector<v8::Local<v8::Value>>* arguments) {
+    v8::LocalVector<v8::String>* parameters,
+    v8::LocalVector<v8::Value>* arguments) {
   v8::Isolate* isolate = context->GetIsolate();
   v8::TryCatch try_catch(isolate);
 
diff --git a/shell/common/node_util.h b/shell/common/node_util.h
@@ -53,8 +53,8 @@ void EmitDeprecationWarning(std::string_view warning_msg,
 v8::MaybeLocal<v8::Value> CompileAndCall(
     v8::Local<v8::Context> context,
     const char* id,
-    std::vector<v8::Local<v8::String>>* parameters,
-    std::vector<v8::Local<v8::Value>>* arguments);
+    v8::LocalVector<v8::String>* parameters,
+    v8::LocalVector<v8::Value>* arguments);
 
 // Wrapper for node::CreateEnvironment that logs failure
 node::Environment* CreateEnvironment(v8::Isolate* isolate,
diff --git a/shell/renderer/electron_sandboxed_renderer_client.cc b/shell/renderer/electron_sandboxed_renderer_client.cc
@@ -124,10 +124,10 @@ void ElectronSandboxedRendererClient::DidCreateScriptContext(
   auto binding = v8::Object::New(isolate);
   InitializeBindings(binding, context, render_frame);
 
-  std::vector<v8::Local<v8::String>> sandbox_preload_bundle_params = {
-      node::FIXED_ONE_BYTE_STRING(isolate, "binding")};
+  v8::LocalVector<v8::String> sandbox_preload_bundle_params(
+      isolate, {node::FIXED_ONE_BYTE_STRING(isolate, "binding")});
 
-  std::vector<v8::Local<v8::Value>> sandbox_preload_bundle_args = {binding};
+  v8::LocalVector<v8::Value> sandbox_preload_bundle_args(isolate, {binding});
 
   util::CompileAndCall(
       isolate->GetCurrentContext(), "electron/js2c/sandbox_bundle",
diff --git a/shell/renderer/preload_realm_context.cc b/shell/renderer/preload_realm_context.cc
@@ -176,10 +176,10 @@ class PreloadRealmLifetimeController
     process.SetReadOnly("type", "service-worker");
     process.SetReadOnly("contextIsolated", true);
 
-    std::vector<v8::Local<v8::String>> preload_realm_bundle_params = {
-        node::FIXED_ONE_BYTE_STRING(isolate, "binding")};
+    v8::LocalVector<v8::String> preload_realm_bundle_params(
+        isolate, {node::FIXED_ONE_BYTE_STRING(isolate, "binding")});
 
-    std::vector<v8::Local<v8::Value>> preload_realm_bundle_args = {binding};
+    v8::LocalVector<v8::Value> preload_realm_bundle_args(isolate, {binding});
 
     util::CompileAndCall(context, "electron/js2c/preload_realm_bundle",
                          &preload_realm_bundle_params,
diff --git a/shell/renderer/renderer_client_base.cc b/shell/renderer/renderer_client_base.cc
@@ -597,11 +597,11 @@ void RendererClientBase::SetupMainWorldOverrides(
     }
   }
 
-  std::vector<v8::Local<v8::String>> isolated_bundle_params = {
-      node::FIXED_ONE_BYTE_STRING(isolate, "isolatedApi")};
+  v8::LocalVector<v8::String> isolated_bundle_params(
+      isolate, {node::FIXED_ONE_BYTE_STRING(isolate, "isolatedApi")});
 
-  std::vector<v8::Local<v8::Value>> isolated_bundle_args = {
-      isolated_api.GetHandle()};
+  v8::LocalVector<v8::Value> isolated_bundle_args(isolate,
+                                                  {isolated_api.GetHandle()});
 
   util::CompileAndCall(context, "electron/js2c/isolated_bundle",
                        &isolated_bundle_params, &isolated_bundle_args);

Original file line number	Diff line number	Diff line change
`@@ -597,11 +597,11 @@ void RendererClientBase::SetupMainWorldOverrides(`
`597`	`597`	`}`
`598`	`598`	`}`
`599`	`599`
`600`		`- std::vector<v8::Local<v8::String>> isolated_bundle_params = {`
`601`		`- node::FIXED_ONE_BYTE_STRING(isolate, "isolatedApi")};`
	`600`	`+ v8::LocalVector<v8::String> isolated_bundle_params(`
	`601`	`+ isolate, {node::FIXED_ONE_BYTE_STRING(isolate, "isolatedApi")});`
`602`	`602`
`603`		`- std::vector<v8::Local<v8::Value>> isolated_bundle_args = {`
`604`		`- isolated_api.GetHandle()};`
	`603`	`+ v8::LocalVector<v8::Value> isolated_bundle_args(isolate,`
	`604`	`+ {isolated_api.GetHandle()});`
`605`	`605`
`606`	`606`	`util::CompileAndCall(context, "electron/js2c/isolated_bundle",`
`607`	`607`	`&isolated_bundle_params, &isolated_bundle_args);`