Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 93eb5823 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

set constant available disk space

parent 97dc0a8a
Loading
Loading
Loading
Loading
+75 −6
Original line number Original line Diff line number Diff line
@@ -3,13 +3,82 @@ Date: Tue, 27 Jun 2023 11:11:53 +0000
Subject: Remove support for device memory and cpu recovery
Subject: Remove support for device memory and cpu recovery


---
---
 storage/browser/blob/blob_memory_controller.cc  | 13 +++++++++++--
 .../browser/quota/quota_device_info_helper.cc   | 17 +++++++++++++++--
 .../device_memory/approximated_device_memory.cc |  7 ++++++-
 .../device_memory/approximated_device_memory.cc |  7 ++++++-
 third_party/blink/common/features.cc            |  4 ++--
 third_party/blink/common/features.cc            |  4 ++--
 .../core/frame/navigator_concurrent_hardware.cc |  8 ++++++--
 .../core/frame/navigator_concurrent_hardware.cc |  8 ++++++--
 .../blink/renderer/core/timing/memory_info.cc   | 14 +++++++++++---
 .../blink/renderer/core/timing/memory_info.cc   | 14 +++++++++++---
 .../renderer/core/timing/window_performance.cc  |  2 +-
 .../renderer/core/timing/window_performance.cc  |  2 +-
 5 files changed, 26 insertions(+), 9 deletions(-)
 7 files changed, 52 insertions(+), 13 deletions(-)


diff --git a/storage/browser/blob/blob_memory_controller.cc b/storage/browser/blob/blob_memory_controller.cc
--- a/storage/browser/blob/blob_memory_controller.cc
+++ b/storage/browser/blob/blob_memory_controller.cc
@@ -49,6 +49,15 @@ using MemoryAllocation = BlobMemoryController::MemoryAllocation;
 using QuotaAllocationTask = BlobMemoryController::QuotaAllocationTask;
 using DiskSpaceFuncPtr = BlobMemoryController::DiskSpaceFuncPtr;
 
+// static
+#if BUILDFLAG(IS_ANDROID)
+float approximated_device_memory_gb_ = 4.0;
+constexpr size_t approximated_device_disk_size = 8ull * 1024 * 1024 * 1024;
+#else
+float approximated_device_memory_gb_ = 8.0;
+constexpr size_t approximated_device_disk_size = 200ull * 1024 * 1024 * 1024;
+#endif
+
 File::Error CreateBlobDirectory(const FilePath& blob_storage_dir) {
   File::Error error = File::FILE_OK;
   base::CreateDirectoryAndGetError(blob_storage_dir, &error);
@@ -78,9 +87,9 @@ BlobStorageLimits CalculateBlobStorageLimitsImpl(
   int64_t disk_size = 0ull;
   uint64_t memory_size = optional_memory_size_for_testing
                              ? optional_memory_size_for_testing.value()
-                             : base::SysInfo::AmountOfPhysicalMemory();
+                             : approximated_device_memory_gb_;
   if (disk_enabled && CreateBlobDirectory(storage_dir) == base::File::FILE_OK)
-    disk_size = base::SysInfo::AmountOfTotalDiskSpace(storage_dir);
+    disk_size = approximated_device_disk_size;
 
   BlobStorageLimits limits;
 
diff --git a/storage/browser/quota/quota_device_info_helper.cc b/storage/browser/quota/quota_device_info_helper.cc
--- a/storage/browser/quota/quota_device_info_helper.cc
+++ b/storage/browser/quota/quota_device_info_helper.cc
@@ -8,17 +8,30 @@
 
 namespace storage {
 
+namespace {
+
+// static
+#if BUILDFLAG(IS_ANDROID)
+float approximated_device_memory_gb_ = 4.0;
+constexpr size_t approximated_device_disk_size = 8ull * 1024 * 1024 * 1024;
+#else
+float approximated_device_memory_gb_ = 8.0;
+constexpr size_t approximated_device_disk_size = 200ull * 1024 * 1024 * 1024;
+#endif
+
+}
+
 QuotaDeviceInfoHelper::~QuotaDeviceInfoHelper() = default;
 
 int64_t QuotaDeviceInfoHelper::AmountOfTotalDiskSpace(
     const base::FilePath& path) const {
-  int64_t disk_space = base::SysInfo::AmountOfTotalDiskSpace(path);
+  int64_t disk_space = approximated_device_disk_size;
   UMA_HISTOGRAM_BOOLEAN("Quota.TotalDiskSpaceIsZero", disk_space <= 0);
   return disk_space;
 }
 
 uint64_t QuotaDeviceInfoHelper::AmountOfPhysicalMemory() const {
-  return base::SysInfo::AmountOfPhysicalMemory();
+  return approximated_device_memory_gb_;
 }
 
 }  // namespace storage
diff --git a/third_party/blink/common/device_memory/approximated_device_memory.cc b/third_party/blink/common/device_memory/approximated_device_memory.cc
diff --git a/third_party/blink/common/device_memory/approximated_device_memory.cc b/third_party/blink/common/device_memory/approximated_device_memory.cc
--- a/third_party/blink/common/device_memory/approximated_device_memory.cc
--- a/third_party/blink/common/device_memory/approximated_device_memory.cc
+++ b/third_party/blink/common/device_memory/approximated_device_memory.cc
+++ b/third_party/blink/common/device_memory/approximated_device_memory.cc