[webkit-changes] [294527] trunk/Source/WebKit

[commit-queue]

Title: [294527] trunk/Source/WebKit

Revision

294527

Author

commit-qu...@webkit.org

Date

2022-05-19 20:46:31 -0700 (Thu, 19 May 2022)

Log Message

Remove unused memory capacity output value in calculateURLCacheSizes
https://bugs.webkit.org/show_bug.cgi?id=240577

Patch by Olivier Blin <olivier.b...@softathome.com> on 2022-05-19
Reviewed by Darin Adler.

Source/WebKit:

calculateURLCacheSizes() had a urlCacheMemoryCapacity output value
since its creation in r203857, which was passed to platformSetURLCacheSize().

But the implementation has been removed for the soup platform in
r205556 when switching to the WebKit network cache, and for the Cocoa
platform in r232201 when dropping NSURLCache support.

urlCacheMemoryCapacity is now unused.

* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::computeCapacity):
* Shared/CacheModel.cpp:
(WebKit::calculateURLCacheSizes):
* Shared/CacheModel.h:

Canonical link: https://commits.webkit.org/250782@main

Modified Paths

• trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp
• trunk/Source/WebKit/Shared/CacheModel.cpp
• trunk/Source/WebKit/Shared/CacheModel.h

Diff

Modified: trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp (294526 => 294527)

--- trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp	2022-05-20 03:38:58 UTC (rev 294526)
+++ trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp	2022-05-20 03:46:31 UTC (rev 294527)
@@ -64,15 +64,13 @@
 
 static size_t computeCapacity(CacheModel cacheModel, const String& cachePath)
 {
-    unsigned urlCacheMemoryCapacity = 0;
-    uint64_t urlCacheDiskCapacity = 0;
     if (auto diskFreeSize = FileSystem::volumeFreeSpace(cachePath)) {
         // As a fudge factor, use 1000 instead of 1024, in case the reported byte
         // count doesn't align exactly to a megabyte boundary.
         *diskFreeSize /= KB * 1000;
-        calculateURLCacheSizes(cacheModel, *diskFreeSize, urlCacheMemoryCapacity, urlCacheDiskCapacity);
+        return calculateURLCacheDiskCapacity(cacheModel, *diskFreeSize);
     }
-    return urlCacheDiskCapacity;
+    return 0;
 }
 
 RefPtr<Cache> Cache::open(NetworkProcess& networkProcess, const String& cachePath, OptionSet<CacheOption> options, PAL::SessionID sessionID)

Modified: trunk/Source/WebKit/Shared/CacheModel.cpp (294526 => 294527)

--- trunk/Source/WebKit/Shared/CacheModel.cpp	2022-05-20 03:38:58 UTC (rev 294526)
+++ trunk/Source/WebKit/Shared/CacheModel.cpp	2022-05-20 03:46:31 UTC (rev 294527)
@@ -125,13 +125,12 @@
     };
 }
 
-void calculateURLCacheSizes(CacheModel cacheModel, uint64_t diskFreeSize, unsigned& urlCacheMemoryCapacity, uint64_t& urlCacheDiskCapacity)
+uint64_t calculateURLCacheDiskCapacity(CacheModel cacheModel, uint64_t diskFreeSize)
 {
+    uint64_t urlCacheDiskCapacity;
+
     switch (cacheModel) {
     case CacheModel::DocumentViewer: {
-        // Foundation memory cache capacity (in bytes)
-        urlCacheMemoryCapacity = 0;
-
         // Disk cache capacity (in bytes)
         urlCacheDiskCapacity = 0;
 
@@ -138,18 +137,6 @@
         break;
     }
     case CacheModel::DocumentBrowser: {
-        uint64_t memorySize = ramSize() / MB;
-
-        // Foundation memory cache capacity (in bytes)
-        if (memorySize >= 2048)
-            urlCacheMemoryCapacity = 4 * MB;
-        else if (memorySize >= 1024)
-            urlCacheMemoryCapacity = 2 * MB;
-        else if (memorySize >= 512)
-            urlCacheMemoryCapacity = 1 * MB;
-        else
-            urlCacheMemoryCapacity = 512 * KB;
-
         // Disk cache capacity (in bytes)
         if (diskFreeSize >= 16384)
             urlCacheDiskCapacity = 75 * MB;
@@ -163,26 +150,6 @@
         break;
     }
     case CacheModel::PrimaryWebBrowser: {
-        uint64_t memorySize = ramSize() / MB;
-
-#if PLATFORM(IOS_FAMILY)
-        if (memorySize >= 1024)
-            urlCacheMemoryCapacity = 16 * MB;
-        else
-            urlCacheMemoryCapacity = 8 * MB;
-#else
-        // Foundation memory cache capacity (in bytes)
-        // (These values are small because WebCore does most caching itself.)
-        if (memorySize >= 1024)
-            urlCacheMemoryCapacity = 4 * MB;
-        else if (memorySize >= 512)
-            urlCacheMemoryCapacity = 2 * MB;
-        else if (memorySize >= 256)
-            urlCacheMemoryCapacity = 1 * MB;
-        else
-            urlCacheMemoryCapacity = 512 * KB;
-#endif
-
         // Disk cache capacity (in bytes)
         if (diskFreeSize >= 16384)
             urlCacheDiskCapacity = 1 * GB;
@@ -202,6 +169,8 @@
     default:
         ASSERT_NOT_REACHED();
     };
+
+    return urlCacheDiskCapacity;
 }
 
 } // namespace WebKit

Modified: trunk/Source/WebKit/Shared/CacheModel.h (294526 => 294527)

--- trunk/Source/WebKit/Shared/CacheModel.h	2022-05-20 03:38:58 UTC (rev 294526)
+++ trunk/Source/WebKit/Shared/CacheModel.h	2022-05-20 03:46:31 UTC (rev 294527)
@@ -39,7 +39,7 @@
 };
 
 void calculateMemoryCacheSizes(CacheModel, unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, Seconds& deadDecodedDataDeletionInterval, unsigned& backForwardCacheCapacity);
-void calculateURLCacheSizes(CacheModel, uint64_t diskFreeSize, unsigned& urlCacheMemoryCapacity, uint64_t& urlCacheDiskCapacity);
+uint64_t calculateURLCacheDiskCapacity(CacheModel, uint64_t diskFreeSize);
 
 } // namespace WebKit
 

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes