diff options
Diffstat (limited to 'www/chromium/files/patch-content_shell_app_shell__main__delegate.cc')
| -rw-r--r-- | www/chromium/files/patch-content_shell_app_shell__main__delegate.cc | 35 |
1 files changed, 22 insertions, 13 deletions
diff --git a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc index a2bfc6210d23..d7508e191661 100644 --- a/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc +++ b/www/chromium/files/patch-content_shell_app_shell__main__delegate.cc @@ -1,20 +1,29 @@ ---- content/shell/app/shell_main_delegate.cc.orig 2020-05-13 18:39:43 UTC +--- content/shell/app/shell_main_delegate.cc.orig 2020-11-13 06:36:43 UTC +++ content/shell/app/shell_main_delegate.cc -@@ -181,7 +181,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit - } +@@ -186,7 +186,7 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit void ShellMainDelegate::PreSandboxStartup() { --#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX)) -+#if defined(ARCH_CPU_ARM_FAMILY) && (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_BSD)) + #if defined(ARCH_CPU_ARM_FAMILY) && \ +- (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS)) ++ (defined(OS_ANDROID) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD)) // Create an instance of the CPU class to parse /proc/cpuinfo and cache // cpu_brand info. base::CPU cpu_info; -@@ -200,7 +200,7 @@ void ShellMainDelegate::PreSandboxStartup() { - // Reporting for sub-processes will be initialized in ZygoteForked. - if (process_type != service_manager::switches::kZygoteProcess) { - crash_reporter::InitializeCrashpad(process_type.empty(), process_type); --#if defined(OS_LINUX) -+#if defined(OS_LINUX) || defined(OS_BSD) - crash_reporter::SetFirstChanceExceptionHandler( - v8::TryHandleWebAssemblyTrapPosix); +@@ -195,7 +195,7 @@ void ShellMainDelegate::PreSandboxStartup() { + // Disable platform crash handling and initialize the crash reporter, if + // requested. + // TODO(crbug.com/753619): Implement crash reporter integration for Fuchsia. +-#if !defined(OS_FUCHSIA) ++#if !defined(OS_FUCHSIA) && !defined(OS_BSD) + if (base::CommandLine::ForCurrentProcess()->HasSwitch( + switches::kEnableCrashReporter)) { + std::string process_type = +@@ -211,7 +211,7 @@ void ShellMainDelegate::PreSandboxStartup() { #endif + } + } +-#endif // !defined(OS_FUCHSIA) ++#endif // !defined(OS_FUCHSIA) && !defined(OS_BSD) + + crash_reporter::InitializeCrashKeys(); + |