aboutsummaryrefslogtreecommitdiff
path: root/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
diff options
context:
space:
mode:
Diffstat (limited to 'www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc')
-rw-r--r--www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc34
1 files changed, 8 insertions, 26 deletions
diff --git a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
index 59c335039718..154ce10da646 100644
--- a/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
+++ b/www/chromium/files/patch-chrome_browser_task__manager_sampling_task__group.cc
@@ -1,30 +1,24 @@
---- chrome/browser/task_manager/sampling/task_group.cc.orig 2021-12-14 11:44:59 UTC
+--- chrome/browser/task_manager/sampling/task_group.cc.orig 2022-02-07 13:39:41 UTC
+++ chrome/browser/task_manager/sampling/task_group.cc
-@@ -37,9 +37,9 @@ const int kBackgroundRefreshTypesMask =
+@@ -37,7 +37,7 @@ const int kBackgroundRefreshTypesMask =
#if defined(OS_WIN)
REFRESH_TYPE_START_TIME | REFRESH_TYPE_CPU_TIME |
#endif // defined(OS_WIN)
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
REFRESH_TYPE_FD_COUNT |
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+ #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
#if BUILDFLAG(ENABLE_NACL)
- REFRESH_TYPE_NACL |
- #endif // BUILDFLAG(ENABLE_NACL)
-@@ -122,9 +122,9 @@ TaskGroup::TaskGroup(
+@@ -122,7 +122,7 @@ TaskGroup::TaskGroup(
#if BUILDFLAG(ENABLE_NACL)
nacl_debug_stub_port_(nacl::kGdbDebugStubPortUnknown),
#endif // BUILDFLAG(ENABLE_NACL)
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
open_fd_count_(-1),
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
+ #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
idle_wakeups_per_second_(-1),
- gpu_memory_has_duplicates_(false),
- is_backgrounded_(false) {
-@@ -141,10 +141,10 @@ TaskGroup::TaskGroup(
+@@ -141,7 +141,7 @@ TaskGroup::TaskGroup(
weak_ptr_factory_.GetWeakPtr()),
base::BindRepeating(&TaskGroup::OnIdleWakeupsRefreshDone,
weak_ptr_factory_.GetWeakPtr()),
@@ -32,12 +26,8 @@
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
base::BindRepeating(&TaskGroup::OnOpenFdCountRefreshDone,
weak_ptr_factory_.GetWeakPtr()),
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
- base::BindRepeating(&TaskGroup::OnProcessPriorityDone,
- weak_ptr_factory_.GetWeakPtr()));
-
-@@ -321,14 +321,14 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
+ #endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
+@@ -321,7 +321,7 @@ void TaskGroup::OnRefreshNaClDebugStubPortDone(int nac
}
#endif // BUILDFLAG(ENABLE_NACL)
@@ -46,11 +36,3 @@
void TaskGroup::OnOpenFdCountRefreshDone(int open_fd_count) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- open_fd_count_ = open_fd_count;
- OnBackgroundRefreshTypeFinished(REFRESH_TYPE_FD_COUNT);
- }
--#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC)
-+#endif // defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_MAC) || defined(OS_BSD)
-
- void TaskGroup::OnCpuRefreshDone(double cpu_usage) {
- DCHECK_CURRENTLY_ON(content::BrowserThread::UI);