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

fix: adopt partition alloc early initialization (#33832)

Browse source 
Refs https://chromium-review.googlesource.com/c/chromium/src/+/3298858
This commit is contained in:
Robo 2022-04-21 05:52:15 +09:00 committed by GitHub
parent 0c864837af
commit b53118ca28
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BUILD.gn
View file

@ -916,7 +916,10 @@ if (is_mac) {
assert(defined(invoker.helper_name_suffix)) assert(defined(invoker.helper_name_suffix))
output_name = electron_helper_name + invoker.helper_name_suffix output_name = electron_helper_name + invoker.helper_name_suffix
deps = [ ":electron_framework+link" ] deps = [
":electron_framework+link",
"//base/allocator:early_zone_registration_mac",
]
if (!is_mas_build) { if (!is_mas_build) {
deps += [ "//sandbox/mac:seatbelt" ] deps += [ "//sandbox/mac:seatbelt" ]
} }
@ -1077,6 +1080,7 @@ if (is_mac) {
":electron_app_plist", ":electron_app_plist",
":electron_app_resources", ":electron_app_resources",
":electron_fuses", ":electron_fuses",
"//base/allocator:early_zone_registration_mac",
"//electron/buildflags", "//electron/buildflags",
] ]
if (is_mas_build) { if (is_mas_build) {

2
shell/app/electron_main_mac.cc
View file

@ -5,6 +5,7 @@
#include <cstdlib> #include <cstdlib>
#include <memory> #include <memory>
#include "base/allocator/early_zone_registration_mac.h"
#include "electron/buildflags/buildflags.h" #include "electron/buildflags/buildflags.h"
#include "electron/fuses.h" #include "electron/fuses.h"
#include "shell/app/electron_library_main.h" #include "shell/app/electron_library_main.h"
@ -28,6 +29,7 @@ namespace {
} // namespace } // namespace
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
partition_alloc::EarlyMallocZoneRegistration();
FixStdioStreams(); FixStdioStreams();
#if BUILDFLAG(ENABLE_RUN_AS_NODE) #if BUILDFLAG(ENABLE_RUN_AS_NODE)