diff options
| author | Matthias Wolf <freebsd@rheinwolf.de> | 2021-10-19 19:33:45 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2021-10-19 19:39:45 +0000 |
| commit | 336f302a55ad11465a4255ae250715b962639010 (patch) | |
| tree | c3e9a3cf7406fdf5fdb0ab3c60d132043615c2d7 /www/chromium/files/patch-base_process_process__metrics.cc | |
| parent | 6996a61924c2899cf68683451707bbed5d6b9794 (diff) | |
| download | ports-336f302a55ad11465a4255ae250715b962639010.tar.gz ports-336f302a55ad11465a4255ae250715b962639010.zip | |
www/chromium: update to 94.0.4606.81
MFH: 2021Q4
Security: https://vuxml.freebsd.org/freebsd/a7732806-0b2a-11ec-836b-3065ec8fd3ec.html
Security: https://vuxml.freebsd.org/freebsd/47b571f2-157b-11ec-ae98-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/3551e106-1b17-11ec-a8a7-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/b6c875f1-1d76-11ec-ae80-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/777edbbe-2230-11ec-8869-704d7b472482.html
Security: https://vuxml.freebsd.org/freebsd/7d3d94d3-2810-11ec-9c51-3065ec8fd3ec.html
Diffstat (limited to 'www/chromium/files/patch-base_process_process__metrics.cc')
| -rw-r--r-- | www/chromium/files/patch-base_process_process__metrics.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/www/chromium/files/patch-base_process_process__metrics.cc b/www/chromium/files/patch-base_process_process__metrics.cc index 54e191de70b0..20a9ba831c6f 100644 --- a/www/chromium/files/patch-base_process_process__metrics.cc +++ b/www/chromium/files/patch-base_process_process__metrics.cc @@ -1,4 +1,4 @@ ---- base/process/process_metrics.cc.orig 2021-06-09 22:13:52 UTC +--- base/process/process_metrics.cc.orig 2021-09-14 01:51:47 UTC +++ base/process/process_metrics.cc @@ -17,7 +17,7 @@ namespace base { @@ -9,7 +9,7 @@ defined(OS_AIX) int CalculateEventsPerSecond(uint64_t event_count, uint64_t* last_event_count, -@@ -53,7 +53,7 @@ SystemMetrics SystemMetrics::Sample() { +@@ -55,7 +55,7 @@ SystemMetrics SystemMetrics::Sample() { SystemMetrics system_metrics; system_metrics.committed_memory_ = GetSystemCommitCharge(); @@ -18,16 +18,16 @@ GetSystemMemoryInfo(&system_metrics.memory_info_); GetVmStatInfo(&system_metrics.vmstat_info_); GetSystemDiskInfo(&system_metrics.disk_info_); -@@ -72,7 +72,7 @@ std::unique_ptr<Value> SystemMetrics::ToValue() const - std::unique_ptr<DictionaryValue> res(new DictionaryValue()); +@@ -74,7 +74,7 @@ Value SystemMetrics::ToValue() const { + Value res(Value::Type::DICTIONARY); - res->SetIntKey("committed_memory", static_cast<int>(committed_memory_)); + res.SetIntKey("committed_memory", static_cast<int>(committed_memory_)); -#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) +#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) || defined(OS_BSD) - std::unique_ptr<DictionaryValue> meminfo = memory_info_.ToValue(); - std::unique_ptr<DictionaryValue> vmstat = vmstat_info_.ToValue(); - meminfo->MergeDictionary(vmstat.get()); -@@ -123,7 +123,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( + Value meminfo = memory_info_.ToValue(); + Value vmstat = vmstat_info_.ToValue(); + meminfo.MergeDictionary(&vmstat); +@@ -125,7 +125,7 @@ double ProcessMetrics::GetPlatformIndependentCPUUsage( } #endif @@ -36,7 +36,7 @@ defined(OS_AIX) int ProcessMetrics::CalculateIdleWakeupsPerSecond( uint64_t absolute_idle_wakeups) { -@@ -136,7 +136,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { +@@ -138,7 +138,7 @@ int ProcessMetrics::GetIdleWakeupsPerSecond() { NOTIMPLEMENTED(); // http://crbug.com/120488 return 0; } |