Diff
Modified: trunk/Source/WebKit2/ChangeLog (182360 => 182361)
--- trunk/Source/WebKit2/ChangeLog 2015-04-05 18:18:45 UTC (rev 182360)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-05 18:35:19 UTC (rev 182361)
@@ -1,3 +1,26 @@
+2015-04-05 Antti Koivisto <an...@apple.com>
+
+ Rename Cache::setMaximumSize to setCapacity
+ https://bugs.webkit.org/show_bug.cgi?id=143418
+
+ Reviewed by Dan Bernstein.
+
+ * NetworkProcess/cache/NetworkCache.cpp:
+ (WebKit::NetworkCache::Cache::setCapacity):
+ (WebKit::NetworkCache::Cache::setMaximumSize): Deleted.
+ * NetworkProcess/cache/NetworkCache.h:
+ * NetworkProcess/cache/NetworkCacheStorage.cpp:
+ (WebKit::NetworkCache::Storage::retrieve):
+ (WebKit::NetworkCache::Storage::store):
+ (WebKit::NetworkCache::Storage::update):
+ (WebKit::NetworkCache::Storage::setCapacity):
+ (WebKit::NetworkCache::Storage::shrinkIfNeeded):
+ (WebKit::NetworkCache::Storage::shrink):
+ (WebKit::NetworkCache::Storage::setMaximumSize): Deleted.
+ * NetworkProcess/cache/NetworkCacheStorage.h:
+ * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
+ (WebKit::NetworkProcess::platformSetCacheModel):
+
2015-04-04 Antti Koivisto <an...@apple.com>
Network cache Bloom filter is too big
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (182360 => 182361)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-04-05 18:18:45 UTC (rev 182360)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp 2015-04-05 18:35:19 UTC (rev 182361)
@@ -76,11 +76,11 @@
return !!m_storage;
}
-void Cache::setMaximumSize(size_t maximumSize)
+void Cache::setCapacity(size_t maximumSize)
{
if (!m_storage)
return;
- m_storage->setMaximumSize(maximumSize);
+ m_storage->setCapacity(maximumSize);
}
static Key makeCacheKey(const WebCore::ResourceRequest& request)
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (182360 => 182361)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-04-05 18:18:45 UTC (rev 182360)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h 2015-04-05 18:35:19 UTC (rev 182361)
@@ -87,7 +87,7 @@
friend class WTF::NeverDestroyed<Cache>;
public:
bool initialize(const String& cachePath, bool enableEfficacyLogging);
- void setMaximumSize(size_t);
+ void setCapacity(size_t);
bool isEnabled() const { return !!m_storage; }
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp (182360 => 182361)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-04-05 18:18:45 UTC (rev 182360)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.cpp 2015-04-05 18:35:19 UTC (rev 182361)
@@ -419,7 +419,7 @@
ASSERT(priority <= maximumRetrievePriority);
ASSERT(!key.isNull());
- if (!m_maximumSize) {
+ if (!m_capacity) {
completionHandler(nullptr);
return;
}
@@ -443,7 +443,7 @@
ASSERT(RunLoop::isMain());
ASSERT(!record.key.isNull());
- if (!m_maximumSize) {
+ if (!m_capacity) {
completionHandler(false, { });
return;
}
@@ -462,7 +462,7 @@
ASSERT(!existingRecord.key.isNull());
ASSERT(existingRecord.key == updateRecord.key);
- if (!m_maximumSize) {
+ if (!m_capacity) {
completionHandler(false, { });
return;
}
@@ -604,20 +604,20 @@
});
}
-void Storage::setMaximumSize(size_t size)
+void Storage::setCapacity(size_t capacity)
{
ASSERT(RunLoop::isMain());
#if !ASSERT_DISABLED
const size_t assumedAverageRecordSize = 50 << 20;
- size_t maximumRecordCount = size / assumedAverageRecordSize;
+ size_t maximumRecordCount = capacity / assumedAverageRecordSize;
// ~10 bits per element are required for <1% false positive rate.
size_t effectiveBloomFilterCapacity = ContentsFilter::tableSize / 10;
// If this gets hit it might be time to increase the filter size.
ASSERT(maximumRecordCount < effectiveBloomFilterCapacity);
#endif
- m_maximumSize = size;
+ m_capacity = capacity;
shrinkIfNeeded();
}
@@ -677,7 +677,7 @@
{
ASSERT(RunLoop::isMain());
- if (m_approximateSize > m_maximumSize)
+ if (m_approximateSize > m_capacity)
shrink();
}
@@ -689,7 +689,7 @@
return;
m_shrinkInProgress = true;
- LOG(NetworkCacheStorage, "(NetworkProcess) shrinking cache approximateSize=%zu, m_maximumSize=%zu", static_cast<size_t>(m_approximateSize), m_maximumSize);
+ LOG(NetworkCacheStorage, "(NetworkProcess) shrinking cache approximateSize=%zu capacity=%zu", static_cast<size_t>(m_approximateSize), m_capacity);
StringCapture cachePathCapture(m_directoryPath);
backgroundIOQueue().dispatch([this, cachePathCapture] {
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h (182360 => 182361)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-04-05 18:18:45 UTC (rev 182360)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStorage.h 2015-04-05 18:35:19 UTC (rev 182361)
@@ -74,7 +74,7 @@
// Null record signals end.
void traverse(TraverseFlags, std::function<void (const Record*, const RecordInfo&)>&&);
- void setMaximumSize(size_t);
+ void setCapacity(size_t);
void clear();
static const unsigned version = 2;
@@ -114,16 +114,16 @@
bool mayContain(const Key&) const;
- // 2^18 bit filter can support up to 26000 entries with false positive rate < 1%.
- using ContentsFilter = BloomFilter<18>;
void addToContentsFilter(const Key&);
const String m_baseDirectoryPath;
const String m_directoryPath;
- size_t m_maximumSize { std::numeric_limits<size_t>::max() };
+ size_t m_capacity { std::numeric_limits<size_t>::max() };
size_t m_approximateSize { 0 };
+ // 2^18 bit filter can support up to 26000 entries with false positive rate < 1%.
+ using ContentsFilter = BloomFilter<18>;
std::unique_ptr<ContentsFilter> m_contentsFilter;
bool m_synchronizationInProgress { false };
Modified: trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm (182360 => 182361)
--- trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-04-05 18:18:45 UTC (rev 182360)
+++ trunk/Source/WebKit2/NetworkProcess/cocoa/NetworkProcessCocoa.mm 2015-04-05 18:35:19 UTC (rev 182361)
@@ -143,7 +143,7 @@
#if ENABLE(NETWORK_CACHE)
auto& networkCache = NetworkCache::singleton();
if (networkCache.isEnabled()) {
- networkCache.setMaximumSize(urlCacheDiskCapacity);
+ networkCache.setCapacity(urlCacheDiskCapacity);
return;
}
#endif
