update to 124.0.6367.207
This commit is contained in:
parent
687f3acd55
commit
fe9bc9d89b
958 changed files with 7372 additions and 6231 deletions
|
@ -1,7 +1,7 @@
|
|||
Index: base/process/process_metrics.h
|
||||
--- base/process/process_metrics.h.orig
|
||||
+++ base/process/process_metrics.h
|
||||
@@ -37,7 +37,7 @@
|
||||
@@ -38,7 +38,7 @@
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
|
@ -10,16 +10,16 @@ Index: base/process/process_metrics.h
|
|||
#include <string>
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
@@ -50,7 +50,7 @@ namespace base {
|
||||
// Full declaration is in process_metrics_iocounters.h.
|
||||
struct IoCounters;
|
||||
@@ -48,7 +48,7 @@
|
||||
|
||||
namespace base {
|
||||
|
||||
-#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID)
|
||||
+#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_BSD)
|
||||
// Minor and major page fault counts since the process creation.
|
||||
// Both counts are process-wide, and exclude child processes.
|
||||
//
|
||||
@@ -105,7 +105,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -103,7 +103,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
// convenience wrapper for CreateProcessMetrics().
|
||||
static std::unique_ptr<ProcessMetrics> CreateCurrentProcessMetrics();
|
||||
|
||||
|
@ -28,8 +28,8 @@ Index: base/process/process_metrics.h
|
|||
// Resident Set Size is a Linux/Android specific memory concept. Do not
|
||||
// attempt to extend this to other platforms.
|
||||
BASE_EXPORT size_t GetResidentSetSize() const;
|
||||
@@ -163,7 +163,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif // BUILDFLAG(IS_WIN)
|
||||
@@ -137,7 +137,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
[[nodiscard]] std::optional<TimeDelta> GetCumulativeCPUUsage();
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
|
@ -37,7 +37,7 @@ Index: base/process/process_metrics.h
|
|||
// Emits the cumulative CPU usage for all currently active threads since they
|
||||
// were started into the output parameter (replacing its current contents).
|
||||
// Threads that have already terminated will not be reported. Thus, the sum of
|
||||
@@ -223,7 +223,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -182,7 +182,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
int GetOpenFdSoftLimit() const;
|
||||
#endif // BUILDFLAG(IS_POSIX)
|
||||
|
||||
|
@ -46,7 +46,7 @@ Index: base/process/process_metrics.h
|
|||
// Bytes of swap as reported by /proc/[pid]/status.
|
||||
uint64_t GetVmSwapBytes() const;
|
||||
|
||||
@@ -244,7 +244,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -203,7 +203,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif // !BUILDFLAG(IS_MAC)
|
||||
|
||||
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
@ -55,7 +55,7 @@ Index: base/process/process_metrics.h
|
|||
int CalculateIdleWakeupsPerSecond(uint64_t absolute_idle_wakeups);
|
||||
#endif
|
||||
#if BUILDFLAG(IS_APPLE)
|
||||
@@ -266,9 +266,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
@@ -225,12 +225,10 @@ class BASE_EXPORT ProcessMetrics {
|
||||
// Used to store the previous times and CPU usage counts so we can
|
||||
// compute the CPU usage between calls.
|
||||
TimeTicks last_cpu_time_;
|
||||
|
@ -63,18 +63,13 @@ Index: base/process/process_metrics.h
|
|||
TimeDelta last_cumulative_cpu_;
|
||||
-#endif
|
||||
|
||||
#if BUILDFLAG(IS_WIN)
|
||||
TimeTicks last_cpu_time_for_precise_cpu_usage_;
|
||||
@@ -276,7 +274,7 @@ class BASE_EXPORT ProcessMetrics {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
- BUILDFLAG(IS_AIX)
|
||||
+ BUILDFLAG(IS_AIX) || BUILDFLAG(IS_BSD)
|
||||
// Same thing for idle wakeups.
|
||||
TimeTicks last_idle_wakeups_time_;
|
||||
uint64_t last_absolute_idle_wakeups_;
|
||||
@@ -316,7 +314,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
|
||||
@@ -271,7 +269,7 @@ BASE_EXPORT void IncreaseFdLimitTo(unsigned int max_de
|
||||
|
||||
#if BUILDFLAG(IS_WIN) || BUILDFLAG(IS_APPLE) || BUILDFLAG(IS_LINUX) || \
|
||||
BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_AIX) || \
|
||||
|
@ -83,7 +78,7 @@ Index: base/process/process_metrics.h
|
|||
// Data about system-wide memory consumption. Values are in KB. Available on
|
||||
// Windows, Mac, Linux, Android and Chrome OS.
|
||||
//
|
||||
@@ -351,7 +349,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
@@ -306,7 +304,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
|
@ -92,7 +87,7 @@ Index: base/process/process_metrics.h
|
|||
// This provides an estimate of available memory as described here:
|
||||
// https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
|
||||
// NOTE: this is ONLY valid in kernels 3.14 and up. Its value will always
|
||||
@@ -366,7 +364,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
@@ -321,7 +319,7 @@ struct BASE_EXPORT SystemMemoryInfoKB {
|
||||
#endif
|
||||
|
||||
#if BUILDFLAG(IS_ANDROID) || BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || \
|
||||
|
@ -101,7 +96,7 @@ Index: base/process/process_metrics.h
|
|||
int buffers = 0;
|
||||
int cached = 0;
|
||||
int active_anon = 0;
|
||||
@@ -403,7 +401,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
|
||||
@@ -358,7 +356,7 @@ BASE_EXPORT bool GetSystemMemoryInfo(SystemMemoryInfoK
|
||||
// BUILDFLAG(IS_FUCHSIA)
|
||||
|
||||
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \
|
||||
|
@ -110,7 +105,7 @@ Index: base/process/process_metrics.h
|
|||
// Parse the data found in /proc/<pid>/stat and return the sum of the
|
||||
// CPU-related ticks. Returns -1 on parse error.
|
||||
// Exposed for testing.
|
||||
@@ -591,7 +589,7 @@ class BASE_EXPORT SystemMetrics {
|
||||
@@ -552,7 +550,7 @@ class BASE_EXPORT SystemMetrics {
|
||||
FRIEND_TEST_ALL_PREFIXES(SystemMetricsTest, SystemMetrics);
|
||||
|
||||
size_t committed_memory_;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue