diff options
| author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-02-06 19:29:36 +0000 |
|---|---|---|
| committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-02-06 19:29:36 +0000 |
| commit | 8d28aa8db0c717bef863b7a7630f48cf3870ffb1 (patch) | |
| tree | ae8b6c930932585d45e586480457898519baa1ce /www/chromium/files/patch-base_process_process__metrics.h | |
| parent | Upgrade to 0.11.0 (diff) | |
www/chromium: update to 56.0.2924.87
- Use system FFmpeg instead of embedded code copy [1]
- Disable PULSEAUDIO option [2]
- Sort _DEPENDS variables
- Regenerate patches with make makepatch
PR: 215271 [1], 216327 [2]
Reported by: jbeich [1]
Approved by: rene
MFH: 2017Q1
Security: https://vuxml.freebsd.org/freebsd/4b9ca994-e3d9-11e6-813d-e8e0b747a45a.html
Diffstat (limited to 'www/chromium/files/patch-base_process_process__metrics.h')
| -rw-r--r-- | www/chromium/files/patch-base_process_process__metrics.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index 7abeb06e2a1c..ca8414ecf548 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,5 +1,5 @@ ---- base/process/process_metrics.h.orig 2016-10-06 04:02:08.000000000 +0300 -+++ base/process/process_metrics.h 2016-10-13 12:58:13.818273000 +0300 +--- base/process/process_metrics.h.orig 2017-01-26 00:49:07 UTC ++++ base/process/process_metrics.h @@ -22,6 +22,12 @@ #include "base/values.h" #include "build/build_config.h" @@ -13,7 +13,7 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #include "base/process/port_provider_mac.h" -@@ -326,13 +332,17 @@ +@@ -326,13 +332,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); |