aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
diff options
context:
space:
mode:
authorMatthias Wolf <freebsd@rheinwolf.de>2021-08-22 08:38:57 +0000
committerRene Ladan <rene@FreeBSD.org>2021-08-22 08:51:02 +0000
commit1a8f509f6d4073363b5a39a8da581e05dec4834c (patch)
tree8936c740a279de0ee24b07fada5e0f2f68f49fd9 /www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
parentf302216145c10a30b4d11951a1611cb7725b8297 (diff)
downloadports-1a8f509f6d4073363b5a39a8da581e05dec4834c.tar.gz
ports-1a8f509f6d4073363b5a39a8da581e05dec4834c.zip
www/chromium: update to 92.0.4515.159
Mark broken on i386 for now, it does not compile there because of a ssize_t * vs off_t * mismatch. MFH: 2021Q3 Security: https://vuxml.freebsd.org/freebsd/128deba6-ff56-11eb-8514-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/c3c6c4a3-f47d-11eb-b632-3065ec8fd3ec.html Security: https://vuxml.freebsd.org/freebsd/76487640-ea29-11eb-a686-3065ec8fd3ec.html (cherry picked from commit 76daa653245e62b0f8e07ef4899c0a5bb176b3da)
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.cc22
1 files changed, 11 insertions, 11 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 4ada1cf4bc66..fb37b2702fef 100644
--- a/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
+++ b/www/chromium/files/patch-chrome_app_chrome__main__delegate.cc
@@ -1,4 +1,4 @@
---- chrome/app/chrome_main_delegate.cc.orig 2021-05-12 22:05:41 UTC
+--- chrome/app/chrome_main_delegate.cc.orig 2021-07-19 18:45:06 UTC
+++ chrome/app/chrome_main_delegate.cc
@@ -150,12 +150,12 @@
#include "v8/include/v8.h"
@@ -78,7 +78,7 @@
defined(OS_CHROMEOS)
// Record the startup process creation time on supported platforms. On Android
// this is recorded in ChromeMainDelegateAndroid.
-@@ -735,7 +735,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -739,7 +739,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
v8_crashpad_support::SetUp();
#endif
@@ -87,7 +87,7 @@
if (!crash_reporter::IsCrashpadEnabled()) {
breakpad::SetFirstChanceExceptionHandler(v8::TryHandleWebAssemblyTrapPosix);
}
-@@ -748,7 +748,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
+@@ -752,7 +752,7 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exi
}
// TODO(crbug.com/1052397): Revisit the macro expression once build flag switch
// of lacros-chrome is complete.
@@ -96,7 +96,7 @@
// This will directly exit if the user asked for help.
HandleHelpSwitches(command_line);
#endif
-@@ -957,7 +957,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -961,7 +961,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
crash_reporter::InitializeCrashKeys();
@@ -105,7 +105,7 @@
ChromeCrashReporterClient::Create();
#endif
-@@ -970,7 +970,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -974,7 +974,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
child_process_logging::Init();
#endif
#if defined(ARCH_CPU_ARM_FAMILY) && \
@@ -114,7 +114,7 @@
// Create an instance of the CPU class to parse /proc/cpuinfo and cache
// cpu_brand info.
base::CPU cpu_info;
-@@ -1088,7 +1088,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1092,7 +1092,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
locale;
}
@@ -123,7 +123,7 @@
// Zygote needs to call InitCrashReporter() in RunZygote().
if (process_type != switches::kZygoteProcess) {
#if defined(OS_ANDROID)
-@@ -1109,7 +1109,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1113,7 +1113,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
}
#endif // defined(OS_ANDROID)
}
@@ -132,7 +132,7 @@
#if defined(OS_ANDROID)
CHECK_EQ(base::android::GetLibraryProcessType(),
-@@ -1129,7 +1129,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
+@@ -1133,7 +1133,7 @@ void ChromeMainDelegate::PreSandboxStartup() {
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.
@@ -141,7 +141,7 @@
AdjustLinuxOOMScore(process_type);
#endif
#if defined(OS_WIN)
-@@ -1171,7 +1171,7 @@ int ChromeMainDelegate::RunProcess(
+@@ -1175,7 +1175,7 @@ int ChromeMainDelegate::RunProcess(
// This entry is not needed on Linux, where the NaCl loader
// process is launched via nacl_helper instead.
@@ -150,7 +150,7 @@
{switches::kNaClLoaderProcess, NaClMain},
#else
{"<invalid>", nullptr}, // To avoid constant array of size 0
-@@ -1199,7 +1199,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
+@@ -1203,7 +1203,7 @@ void ChromeMainDelegate::ProcessExiting(const std::str
#endif // !defined(OS_ANDROID)
}
@@ -159,7 +159,7 @@
void ChromeMainDelegate::ZygoteStarting(
std::vector<std::unique_ptr<content::ZygoteForkDelegate>>* delegates) {
#if BUILDFLAG(IS_CHROMEOS_ASH)
-@@ -1236,7 +1236,7 @@ void ChromeMainDelegate::ZygoteForked() {
+@@ -1240,7 +1240,7 @@ void ChromeMainDelegate::ZygoteForked() {
crash_keys::SetCrashKeysFromCommandLine(*command_line);
}