diff options
author | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-06-20 20:20:44 +0000 |
---|---|---|
committer | Carlos J. Puga Medina <cpm@FreeBSD.org> | 2017-06-20 20:20:44 +0000 |
commit | 893d9b13f0873ea4181f1998d531ece5149a700e (patch) | |
tree | c20b4d7aded464f58574f7dd4d1217a5a7ab5efe /www/chromium/files/patch-base_process_process__metrics.h | |
parent | - devel/ace+tao-doc: Update from 5.5.0 to 6.4.3 (diff) |
www/chromium: update to 59.0.3071.104
- Use https in WWW and MASTER_SITES
- Sort ONLY_FOR_ARCHS, USES, USE_GNOME and GN_ARGS
- Put in correct place MAKE_ENV+= V=1 variable
- Use LLD linker by default for supported archs
- Fix DEBUG option
- Fix gpu_info_collector.cc warning: control may reach end of non-void function [-Wreturn-type]
- Get rid of multiple definition errors
Changelog: https://chromium.googlesource.com/chromium/src/+log/58.0.3029.110..59.0.3071.104?pretty=fuller&n=10000
MFH: 2017Q2
Security: https://www.vuxml.org/freebsd/52f4b48b-4ac3-11e7-99aa-e8e0b747a45a.html
Security: https://www.vuxml.org/freebsd/f53dd5cc-527f-11e7-a772-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 | 31 |
1 files changed, 29 insertions, 2 deletions
diff --git a/www/chromium/files/patch-base_process_process__metrics.h b/www/chromium/files/patch-base_process_process__metrics.h index b40a0e896d2b..1503c971bee5 100644 --- a/www/chromium/files/patch-base_process_process__metrics.h +++ b/www/chromium/files/patch-base_process_process__metrics.h @@ -1,4 +1,4 @@ ---- base/process/process_metrics.h.orig 2017-04-19 19:06:28 UTC +--- base/process/process_metrics.h.orig 2017-06-05 19:03:00 UTC +++ base/process/process_metrics.h @@ -22,6 +22,12 @@ #include "base/values.h" @@ -13,7 +13,34 @@ #if defined(OS_MACOSX) #include <mach/mach.h> #include "base/process/port_provider_mac.h" -@@ -329,13 +335,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(Sys +@@ -205,7 +211,7 @@ class BASE_EXPORT ProcessMetrics { + // otherwise. + bool GetIOCounters(IoCounters* io_counters) const; + +-#if defined(OS_LINUX) ++#if defined(OS_LINUX) || defined(OS_BSD) + // Returns the number of file descriptors currently open by the process, or + // -1 on error. + int GetOpenFdCount() const; +@@ -213,7 +219,7 @@ class BASE_EXPORT ProcessMetrics { + // Returns the soft limit of file descriptors that can be opened by the + // process, or -1 on error. + int GetOpenFdSoftLimit() const; +-#endif // defined(OS_LINUX) ++#endif // defined(OS_LINUX) || defined(OS_BSD) + + private: + #if !defined(OS_MACOSX) || defined(OS_IOS) +@@ -289,7 +295,7 @@ BASE_EXPORT void SetFdLimit(unsigned int max_descripto + #endif // defined(OS_POSIX) + + #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) || \ +- defined(OS_ANDROID) ++ defined(OS_ANDROID) || defined(OS_BSD) + // Data about system-wide memory consumption. Values are in KB. Available on + // Windows, Mac, Linux, Android and Chrome OS. + // +@@ -383,13 +389,17 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK // CPU-related ticks. Returns -1 on parse error. // Exposed for testing. BASE_EXPORT int ParseProcStatCPU(const std::string& input); |