summaryrefslogtreecommitdiff
path: root/www/iridium/files/patch-chrome_app_chrome__main.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2020-07-23 16:31:18 +0000
committerRene Ladan <rene@FreeBSD.org>2020-07-23 16:31:18 +0000
commit651302b592fe54c5197641402df87ff216c27903 (patch)
tree784a10fc6050d3be8786fd6f4f954d7802bd9204 /www/iridium/files/patch-chrome_app_chrome__main.cc
parentAdd compiler:c++14-lang to USES to atttempt to fix on GCC-based systems: (diff)
www/iridium: update to 2020.04.81
PR: 245959 Submitted by: Matthias Wolf MFH: 2020Q3 Security: any Chromium vulnerability between 73 and 81
Diffstat (limited to 'www/iridium/files/patch-chrome_app_chrome__main.cc')
-rw-r--r--www/iridium/files/patch-chrome_app_chrome__main.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/www/iridium/files/patch-chrome_app_chrome__main.cc b/www/iridium/files/patch-chrome_app_chrome__main.cc
index adfcbba22044..28a06a8d2f72 100644
--- a/www/iridium/files/patch-chrome_app_chrome__main.cc
+++ b/www/iridium/files/patch-chrome_app_chrome__main.cc
@@ -1,7 +1,7 @@
---- chrome/app/chrome_main.cc.orig 2019-04-10 10:50:03 UTC
+--- chrome/app/chrome_main.cc.orig 2020-04-10 00:39:09 UTC
+++ chrome/app/chrome_main.cc
-@@ -110,11 +110,11 @@ int ChromeMain(int argc, const char** argv) {
- #endif
+@@ -118,11 +118,11 @@ int ChromeMain(int argc, const char** argv) {
+ MainThreadStackSamplingProfiler scoped_sampling_profiler;
// Chrome-specific process modes.
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
@@ -12,5 +12,5 @@
-#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN)
+#endif // defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_WIN) || defined(OS_BSD)
- int rv = content::ContentMain(params);
-
+ #if !defined(CHROME_MULTIPLE_DLL_CHILD)
+ net::trace_urlreq_cb = &trace_url_request;