mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

build: reland bump Node.js to v22.9.0 (#44597)

Browse source 
Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com>
This commit is contained in:
Keeley Hammond 2024-11-13 06:34:30 -08:00 • committed by GitHub
parent 0fd16dc9e2
commit 946ab5f1d7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
76 changed files with 1465 additions and 3997 deletions
Download patch file Download diff file Expand all files Collapse all files

2
shell/app/node_main.cc
View file

@ -183,7 +183,7 @@ int NodeMain() {
const std::vector<std::string> args = ElectronCommandLine::AsUtf8();
ExitIfContainsDisallowedFlags(args);
std::unique_ptr<node::InitializationResult> result =
std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
args,
{node::ProcessInitializationFlags::kNoInitializeV8,

6
shell/browser/file_system_access/file_system_access_permission_context.cc
View file

@ -165,8 +165,10 @@ bool ShouldBlockAccessToPath(const base::FilePath& path,
ChromeFileSystemAccessPermissionContext::kBlockedPaths) {
if (key == ChromeFileSystemAccessPermissionContext::kNoBasePathKey) {
rules.emplace_back(base::FilePath{rule_path}, type);
} else if (base::FilePath path; base::PathService::Get(key, &path)) {
rules.emplace_back(rule_path ? path.Append(rule_path) : path, type);
} else if (base::FilePath block_path;
base::PathService::Get(key, &block_path)) {
rules.emplace_back(rule_path ? block_path.Append(rule_path) : block_path,
type);
}
}

2
shell/common/node_bindings.cc
View file

@ -568,7 +568,7 @@ void NodeBindings::Initialize(v8::Local<v8::Context> context) {
if (!fuses::IsNodeOptionsEnabled())
process_flags |= node::ProcessInitializationFlags::kDisableNodeOptionsEnv;
std::unique_ptr<node::InitializationResult> result =
std::shared_ptr<node::InitializationResult> result =
node::InitializeOncePerProcess(
args,
static_cast<node::ProcessInitializationFlags::Flags>(process_flags));