diff options
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.cc | 26 |
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 7fa5cc6e1e36..0e034f5a2b61 100644 --- a/www/chromium/files/patch-content_browser_browser__main__loop.cc +++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc @@ -1,6 +1,6 @@ ---- content/browser/browser_main_loop.cc.orig 2019-03-11 22:00:57 UTC +--- content/browser/browser_main_loop.cc.orig 2019-06-04 18:55:22 UTC +++ content/browser/browser_main_loop.cc -@@ -250,6 +250,13 @@ +@@ -251,6 +251,13 @@ #include "mojo/public/cpp/bindings/lib/test_random_mojo_delays.h" #endif @@ -14,7 +14,7 @@ // One of the linux specific headers defines this as a macro. #ifdef DestroyAll #undef DestroyAll -@@ -585,6 +592,11 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -593,6 +600,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,21 +26,21 @@ #endif #if defined(USE_X11) -@@ -629,7 +641,7 @@ int BrowserMainLoop::EarlyInitialization() { +@@ -636,7 +648,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) +-#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || \ ++#if defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || \ + defined(OS_ANDROID) // 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() { +@@ -646,7 +658,7 @@ int BrowserMainLoop::EarlyInitialization() { + // users can easily hit this limit with many open tabs. Bump up the limit to // 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) +-#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || ++#endif // defined(OS_MACOSX) || defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_BSD) || + // defined(OS_ANDROID) #if defined(OS_WIN) - net::EnsureWinsockInit(); |