summaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_browser_browser__main__loop.cc
diff options
context:
space:
mode:
authorRene Ladan <rene@FreeBSD.org>2022-03-02 10:32:47 +0100
committerRene Ladan <rene@FreeBSD.org>2022-03-02 10:32:47 +0100
commitbfedd5f1f016c174f3fe18cd38c8517ece7b1e9b (patch)
tree1d6f8dd03169ed2d788d910cce625af1608e74d0 /www/chromium/files/patch-content_browser_browser__main__loop.cc
parentsecurity/vuxml: add www/chromium < 99.0.4844.51 (diff)
www/chromium: update to 99.0.4844.51
On the port side, this update brings: - libvulkan enabled by default - more unit tests enabled - no longer dependent on Python 2.7 Security: https://vuxml.freebsd.org/freebsd/e0914087-9a09-11ec-9e61-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-content_browser_browser__main__loop.cc')
-rw-r--r--www/chromium/files/patch-content_browser_browser__main__loop.cc26
1 files changed, 13 insertions, 13 deletions
diff --git a/www/chromium/files/patch-content_browser_browser__main__loop.cc b/www/chromium/files/patch-content_browser_browser__main__loop.cc
index f5894fcc95f3..416938efc96e 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,10 +1,10 @@
---- content/browser/browser_main_loop.cc.orig 2022-02-07 13:39:41 UTC
+--- content/browser/browser_main_loop.cc.orig 2022-02-28 16:54:41 UTC
+++ content/browser/browser_main_loop.cc
-@@ -238,6 +238,12 @@
+@@ -239,6 +239,12 @@
#include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
#endif
-+#if defined(OS_BSD)
++#if BUILDFLAG(IS_BSD)
+#include "content/browser/sandbox_host_linux.h"
+#include "content/public/common/zygote/sandbox_support_linux.h"
+#include "sandbox/policy/sandbox.h"
@@ -13,11 +13,11 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -545,6 +551,12 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -546,6 +552,12 @@ int BrowserMainLoop::EarlyInitialization() {
// by now since a thread to start the ServiceManager has been created
// before the browser main loop starts.
DCHECK(SandboxHostLinux::GetInstance()->IsInitialized());
-+#elif defined(OS_BSD)
++#elif BUILDFLAG(IS_BSD)
+ base::FileHandleMappingVector additional_remapped_fds;
+ base::LaunchOptions options;
+ SandboxHostLinux::GetInstance()->Init();
@@ -26,21 +26,21 @@
#endif
// GLib's spawning of new processes is buggy, so it's important that at this
-@@ -572,7 +584,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -573,7 +585,7 @@ int BrowserMainLoop::EarlyInitialization() {
// Up the priority of the UI thread unless it was already high (since Mac
// and recent versions of Android (O+) do this automatically).
--#if !defined(OS_MAC)
-+#if !defined(OS_MAC) && !defined(OS_BSD)
+-#if !BUILDFLAG(IS_MAC)
++#if !BUILDFLAG(IS_MAC) && !BUILDFLAG(IS_BSD)
if (base::FeatureList::IsEnabled(
features::kBrowserUseDisplayThreadPriority) &&
base::PlatformThread::GetCurrentThreadPriority() <
-@@ -583,7 +595,7 @@ int BrowserMainLoop::EarlyInitialization() {
- #endif // !defined(OS_MAC)
+@@ -584,7 +596,7 @@ int BrowserMainLoop::EarlyInitialization() {
+ #endif // !BUILDFLAG(IS_MAC)
- #if defined(OS_MAC) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
-- defined(OS_ANDROID)
-+ defined(OS_ANDROID) || defined(OS_BSD)
+ #if BUILDFLAG(IS_MAC) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
+- BUILDFLAG(IS_ANDROID)
++ BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
// We use quite a few file descriptors for our IPC as well as disk the disk
// cache,and the default limit on the Mac is low (256), so bump it up.