aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-content_browser_browser__main__loop.cc
diff options
context:
space:
mode:
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.cc28
1 files changed, 23 insertions, 5 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 c5d9dd0876e0..7fa5cc6e1e36 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,7 +1,7 @@
---- content/browser/browser_main_loop.cc.orig 2018-08-01 00:08:43.000000000 +0200
-+++ content/browser/browser_main_loop.cc 2018-08-05 15:40:45.172441000 +0200
-@@ -234,6 +234,13 @@
- #include "services/ui/common/image_cursors_set.h"
+--- content/browser/browser_main_loop.cc.orig 2019-03-11 22:00:57 UTC
++++ content/browser/browser_main_loop.cc
+@@ -250,6 +250,13 @@
+ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h"
#endif
+#if defined(OS_BSD)
@@ -14,7 +14,7 @@
// One of the linux specific headers defines this as a macro.
#ifdef DestroyAll
#undef DestroyAll
-@@ -546,6 +553,11 @@
+@@ -585,6 +592,11 @@ 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());
@@ -26,3 +26,21 @@
#endif
#if defined(USE_X11)
+@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() {
+ #endif // defined(OS_ANDROID) || defined(OS_CHROMEOS)
+
+ #if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \
+- defined(OS_ANDROID)
++ defined(OS_ANDROID) || defined(OS_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.
+
+@@ -639,7 +651,7 @@ int BrowserMainLoop::EarlyInitialization() {
+ // an arbitrarily high number. See https://crbug.com/539567
+ base::IncreaseFdLimitTo(8192);
+ #endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) ||
+- // defined(OS_ANDROID)
++ // defined(OS_ANDROID) || defined(OS_BSD)
+
+ #if defined(OS_WIN)
+ net::EnsureWinsockInit();