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

fix: trace-startup crashing child process on macOS (32-x-y) (#44292)

Browse source 
* fix: trace-startup crashing child process on macOS (32-x-y)

* chore: disable test on linux arm

* chore: also disable on linux arm64
This commit is contained in:
Robo 2024-10-19 00:16:53 +09:00 • committed by GitHub
parent 519da8e634
commit d5d936d078
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 46 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
shell/app/electron_main_delegate.h
View file

@ -32,6 +32,12 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
base::StringPiece GetBrowserV8SnapshotFilename() override;
#if BUILDFLAG(IS_MAC)
void OverrideChildProcessPath();
void OverrideFrameworkBundlePath();
void SetUpBundleOverrides();
#endif
protected:
// content::ContentMainDelegate:
std::optional<int> BasicStartupComplete() override;
@ -54,12 +60,6 @@ class ElectronMainDelegate : public content::ContentMainDelegate {
#endif
private:
#if BUILDFLAG(IS_MAC)
void OverrideChildProcessPath();
void OverrideFrameworkBundlePath();
void SetUpBundleOverrides();
#endif
std::unique_ptr<content::ContentBrowserClient> browser_client_;
std::unique_ptr<content::ContentClient> content_client_;
std::unique_ptr<content::ContentGpuClient> gpu_client_;