Changeset 220963 in webkit


Ignore:
Timestamp:
Aug 21, 2017 5:59:00 AM (7 years ago)
Author:
commit-queue@webkit.org
Message:

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

Patch by Charlie Turner <​cturner@igalia.com> 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.

Location:
trunk/Source/WebKit
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r220957 r220963  
     12017-08-21  Charlie Turner  <cturner@igalia.com>
     2
     3        MemoryCache::setCapacities assertion failure maxDeadBytes <= totalBytes
     4        https://bugs.webkit.org/show_bug.cgi?id=175571
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * Shared/CacheModel.cpp:
     9        (WebKit::calculateMemoryCacheSizes): Ensure cacheTotalCapacity is
     10        set to a reasonable value even in low-memory environments.
     11
    1122017-08-20  Chris Dumez  <cdumez@apple.com>
    213

  • trunk/Source/WebKit/Shared/CacheModel.cpp

    r215152 r220963  
    5252        else if (memorySize >= 512)
    5353            cacheTotalCapacity = 16 * MB;
     54        else
     55            cacheTotalCapacity = 8 * MB;
    5456
    5557        cacheMinDeadCapacity = 0;
    … …  
    7678        else if (memorySize >= 512)
    7779            cacheTotalCapacity = 16 * MB;
     80        else
     81            cacheTotalCapacity = 8 * MB;
    7882
    7983        cacheMinDeadCapacity = cacheTotalCapacity / 8;
    … …  
    103107        else if (memorySize >= 512)
    104108            cacheTotalCapacity = 32 * MB;
     109        else
     110            cacheTotalCapacity = 16 * MB;
    105111
    106112        cacheMinDeadCapacity = cacheTotalCapacity / 4;
Note: See TracChangeset for help on using the changeset viewer.