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.cc16
1 files changed, 8 insertions, 8 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 6efb4bb2760f..7df3fd47dc43 100644
--- a/www/chromium/files/patch-content_browser_browser__main__loop.cc
+++ b/www/chromium/files/patch-content_browser_browser__main__loop.cc
@@ -1,15 +1,15 @@
---- content/browser/browser_main_loop.cc.orig 2021-01-18 21:28:57 UTC
+--- content/browser/browser_main_loop.cc.orig 2021-03-12 23:57:24 UTC
+++ content/browser/browser_main_loop.cc
-@@ -366,7 +366,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMem
+@@ -368,7 +368,7 @@ std::unique_ptr<base::MemoryPressureMonitor> CreateMem
if (chromeos::switches::MemoryPressureHandlingEnabled())
monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>();
#elif defined(OS_MAC) || defined(OS_WIN) || defined(OS_FUCHSIA) || \
-- (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST))
-+ (defined(OS_LINUX) && !defined(OS_CHROMEOS) && !BUILDFLAG(IS_CHROMECAST)) || defined(OS_BSD)
+- ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
++ defined(OS_BSD) || ((defined(OS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
+ !BUILDFLAG(IS_CHROMECAST))
monitor = std::make_unique<util::MultiSourceMemoryPressureMonitor>();
#endif
- // No memory monitor on other platforms...
-@@ -611,7 +611,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -566,7 +566,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).
@@ -18,7 +18,7 @@
if (base::FeatureList::IsEnabled(
features::kBrowserUseDisplayThreadPriority) &&
base::PlatformThread::GetCurrentThreadPriority() <
-@@ -621,7 +621,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -576,7 +576,7 @@ int BrowserMainLoop::EarlyInitialization() {
}
#endif // !defined(OS_MAC)
@@ -27,7 +27,7 @@
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.
-@@ -631,7 +631,7 @@ int BrowserMainLoop::EarlyInitialization() {
+@@ -586,7 +586,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);