Title: [220963] trunk/Source/WebKit
Revision
220963
Author
[email protected]
Date
2017-08-21 05:59:00 -0700 (Mon, 21 Aug 2017)

Log Message

MemoryCache::setCapacities assertion failure maxDeadBytes <= totalBytes
https://bugs.webkit.org/show_bug.cgi?id=175571

Patch by Charlie Turner <[email protected]> on 2017-08-21
Reviewed by Antti Koivisto.

* Shared/CacheModel.cpp:
(WebKit::calculateMemoryCacheSizes): Ensure cacheTotalCapacity is
set to a reasonable value even in low-memory environments.

Modified Paths

Diff

Modified: trunk/Source/WebKit/ChangeLog (220962 => 220963)


--- trunk/Source/WebKit/ChangeLog	2017-08-21 12:56:44 UTC (rev 220962)
+++ trunk/Source/WebKit/ChangeLog	2017-08-21 12:59:00 UTC (rev 220963)
@@ -1,3 +1,14 @@
+2017-08-21  Charlie Turner  <[email protected]>
+
+        MemoryCache::setCapacities assertion failure maxDeadBytes <= totalBytes
+        https://bugs.webkit.org/show_bug.cgi?id=175571
+
+        Reviewed by Antti Koivisto.
+
+        * Shared/CacheModel.cpp:
+        (WebKit::calculateMemoryCacheSizes): Ensure cacheTotalCapacity is
+        set to a reasonable value even in low-memory environments.
+
 2017-08-20  Chris Dumez  <[email protected]>
 
         Simplify calls to LoaderStrategy::startPingLoad()

Modified: trunk/Source/WebKit/Shared/CacheModel.cpp (220962 => 220963)


--- trunk/Source/WebKit/Shared/CacheModel.cpp	2017-08-21 12:56:44 UTC (rev 220962)
+++ trunk/Source/WebKit/Shared/CacheModel.cpp	2017-08-21 12:59:00 UTC (rev 220963)
@@ -51,6 +51,8 @@
             cacheTotalCapacity = 32 * MB;
         else if (memorySize >= 512)
             cacheTotalCapacity = 16 * MB;
+        else
+            cacheTotalCapacity = 8 * MB;
 
         cacheMinDeadCapacity = 0;
         cacheMaxDeadCapacity = 0;
@@ -75,6 +77,8 @@
             cacheTotalCapacity = 32 * MB;
         else if (memorySize >= 512)
             cacheTotalCapacity = 16 * MB;
+        else
+            cacheTotalCapacity = 8 * MB;
 
         cacheMinDeadCapacity = cacheTotalCapacity / 8;
         cacheMaxDeadCapacity = cacheTotalCapacity / 4;
@@ -102,6 +106,8 @@
             cacheTotalCapacity = 64 * MB;
         else if (memorySize >= 512)
             cacheTotalCapacity = 32 * MB;
+        else
+            cacheTotalCapacity = 16 * MB;
 
         cacheMinDeadCapacity = cacheTotalCapacity / 4;
         cacheMaxDeadCapacity = cacheTotalCapacity / 2;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to