diff options
Diffstat (limited to 'www/chromium/files/patch-chrome_app_chrome__main__delegate.cc')
| -rw-r--r-- | www/chromium/files/patch-chrome_app_chrome__main__delegate.cc | 88 |
1 files changed, 26 insertions, 62 deletions
diff --git a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc index c56c38b1f390..e4fd91ff05ba 100644 --- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc +++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc @@ -1,6 +1,6 @@ ---- chrome/app/chrome_main_delegate.cc.orig 2017-12-15 02:04:07.000000000 +0100 -+++ chrome/app/chrome_main_delegate.cc 2017-12-24 00:00:14.610706000 +0100 -@@ -96,7 +96,7 @@ +--- chrome/app/chrome_main_delegate.cc.orig 2018-02-24 16:25:09.000000000 +0100 ++++ chrome/app/chrome_main_delegate.cc 2018-03-03 20:07:40.484969000 +0100 +@@ -98,7 +98,7 @@ #include "chrome/app/shutdown_signal_handlers_posix.h" #endif @@ -9,7 +9,7 @@ #include "components/nacl/common/nacl_paths.h" #include "components/nacl/zygote/nacl_fork_delegate_linux.h" #endif -@@ -137,7 +137,7 @@ +@@ -133,7 +133,7 @@ #include "v8/include/v8.h" #endif @@ -18,34 +18,16 @@ #include "base/environment.h" #endif -@@ -176,7 +176,7 @@ - g_chrome_content_browser_client = LAZY_INSTANCE_INITIALIZER; - #endif +@@ -238,7 +238,7 @@ --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - base::LazyInstance<ChromeCrashReporterClient>::Leaky g_chrome_crash_client = - LAZY_INSTANCE_INITIALIZER; - #endif -@@ -304,7 +304,7 @@ - // and resources loaded. - bool SubprocessNeedsResourceBundle(const std::string& process_type) { - return --#if defined(OS_POSIX) && !defined(OS_MACOSX) -+#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_BSD) - // The zygote process opens the resources for the renderers. - process_type == switches::kZygoteProcess || - #endif -@@ -356,7 +356,7 @@ - } - #endif + #endif // defined(OS_WIN) --#if !defined(OS_MACOSX) && !defined(OS_ANDROID) -+#if !defined(OS_MACOSX) && !defined(OS_ANDROID) && !defined(OS_BSD) - void SIGTERMProfilingShutdown(int signal) { - Profiling::Stop(); - struct sigaction sigact; -@@ -408,7 +408,7 @@ +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + void AdjustLinuxOOMScore(const std::string& process_type) { + // Browsers and zygotes should still be killable, but killed last. + const int kZygoteScore = 0; +@@ -407,7 +407,7 @@ std::string process_type = command_line->GetSwitchValueASCII(switches::kProcessType); @@ -54,7 +36,7 @@ // On Linux, Chrome does not support running multiple copies under different // DISPLAYs, so the profile directory can be specified in the environment to // support the virtual desktop use-case. -@@ -582,7 +582,7 @@ +@@ -581,7 +581,7 @@ #if defined(OS_CHROMEOS) chromeos::RegisterPathProvider(); #endif @@ -63,7 +45,7 @@ nacl::RegisterPathProvider(); #endif -@@ -604,7 +604,7 @@ +@@ -603,7 +603,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -72,7 +54,7 @@ } else if (format_str == "log") { format = diagnostics::DiagnosticsWriter::LOG; } else { -@@ -654,7 +654,7 @@ +@@ -653,7 +653,7 @@ std::string format_str = command_line.GetSwitchValueASCII(switches::kDiagnosticsFormat); if (format_str == "machine") { @@ -81,17 +63,8 @@ } else if (format_str == "human") { format = diagnostics::DiagnosticsWriter::HUMAN; } else { -@@ -766,7 +766,7 @@ - std::string process_type = - command_line.GetSwitchValueASCII(switches::kProcessType); - --#if defined(OS_POSIX) -+#if defined(OS_POSIX) && !defined(OS_BSD) - crash_reporter::SetCrashReporterClient(g_chrome_crash_client.Pointer()); - #endif - -@@ -906,7 +906,7 @@ - chrome::InitializePDF(); +@@ -915,7 +915,7 @@ + InitializePDF(); #endif -#if defined(OS_POSIX) && !defined(OS_MACOSX) @@ -99,7 +72,7 @@ // Zygote needs to call InitCrashReporter() in RunZygote(). if (process_type != switches::kZygoteProcess) { #if defined(OS_ANDROID) -@@ -922,7 +922,7 @@ +@@ -931,7 +931,7 @@ breakpad::InitCrashReporter(process_type); #endif // defined(OS_ANDROID) } @@ -108,21 +81,12 @@ // After all the platform Breakpads have been initialized, store the command // line for crash reporting. -@@ -975,7 +975,7 @@ - // This entry is not needed on Linux, where the NaCl loader - // process is launched via nacl_helper instead. - #if BUILDFLAG(ENABLE_NACL) && !defined(CHROME_MULTIPLE_DLL_BROWSER) && \ -- !defined(OS_LINUX) -+ !defined(OS_LINUX) && !defined(OS_BSD) - {switches::kNaClLoaderProcess, NaClMain}, - #else - {"<invalid>", NULL}, // To avoid constant array of size 0 -@@ -1028,7 +1028,7 @@ +@@ -941,7 +941,7 @@ + void ChromeMainDelegate::SandboxInitialized(const std::string& process_type) { + // Note: If you are adding a new process type below, be sure to adjust the + // AdjustLinuxOOMScore function too. +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) && !defined(OS_BSD) + AdjustLinuxOOMScore(process_type); #endif - return process_type == switches::kRelauncherProcess; - } --#elif defined(OS_POSIX) && !defined(OS_ANDROID) -+#elif defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_BSD) - void ChromeMainDelegate::ZygoteStarting( - std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) { - #if defined(OS_CHROMEOS) + #if defined(OS_WIN) |