sync ports with The Matrix

This commit is contained in:
purplerain 2023-09-14 00:49:35 +00:00
parent 9d4d2e721a
commit 79bc6d9d97
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
846 changed files with 10693 additions and 8131 deletions

View file

@ -1,7 +1,7 @@
Index: base/system/sys_info.h
--- base/system/sys_info.h.orig
+++ base/system/sys_info.h
@@ -261,6 +261,8 @@ class BASE_EXPORT SysInfo {
@@ -264,6 +264,8 @@ class BASE_EXPORT SysInfo {
static void ResetCpuSecurityMitigationsEnabledForTesting();
#endif
@ -10,7 +10,7 @@ Index: base/system/sys_info.h
private:
friend class test::ScopedAmountOfPhysicalMemoryOverride;
FRIEND_TEST_ALL_PREFIXES(SysInfoTest, AmountOfAvailablePhysicalMemory);
@@ -273,7 +275,7 @@ class BASE_EXPORT SysInfo {
@@ -276,7 +278,7 @@ class BASE_EXPORT SysInfo {
static HardwareInfo GetHardwareInfoSync();
#if BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS) || BUILDFLAG(IS_ANDROID) || \