Title: [221247] releases/WebKitGTK/webkit-2.18/Source/WebKit
- Revision
- 221247
- Author
- [email protected]
- Date
- 2017-08-28 05:43:16 -0700 (Mon, 28 Aug 2017)
Log Message
Merge r220963 - 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: releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog (221246 => 221247)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-08-28 12:32:34 UTC (rev 221246)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/ChangeLog 2017-08-28 12:43:16 UTC (rev 221247)
@@ -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-18 Chris Dumez <[email protected]>
REGRESSION (r220601): Crash when closing google doc after switching the order of tabs in safari
Modified: releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CacheModel.cpp (221246 => 221247)
--- releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CacheModel.cpp 2017-08-28 12:32:34 UTC (rev 221246)
+++ releases/WebKitGTK/webkit-2.18/Source/WebKit/Shared/CacheModel.cpp 2017-08-28 12:43:16 UTC (rev 221247)
@@ -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
