Merge WebKit at r70209: Initial merge by Git

Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e

1 files changed, 2 insertions, 9 deletions

diff --git a/WebKit/chromium/src/WebCache.cpp b/WebKit/chromium/src/WebCache.cpp
index 9d03a4d..c124bdf 100644
--- a/WebKit/chromium/src/WebCache.cpp
+++ b/WebKit/chromium/src/WebCache.cpp
@@ -67,15 +67,8 @@ void WebCache::clear()
 {
     Cache* cache = WebCore::cache();
     if (cache && !cache->disabled()) {
-        // NOTE: I think using setDisabled() instead of setCapacities() will
-        // remove from the cache items that won't actually be freed from memory
-        // (due to other live references to them), so it just results in wasting
-        // time later and not saving memory compared to the below technique.
-        unsigned minDeadCapacity = cache->m_minDeadCapacity;
-        unsigned maxDeadCapacity = cache->m_maxDeadCapacity;
-        unsigned capacity = cache->m_capacity;
-        cache->setCapacities(0, 0, 0);  // Will prune the cache.
-        cache->setCapacities(minDeadCapacity, maxDeadCapacity, capacity);
+        cache->setDisabled(true);
+        cache->setDisabled(false);
     }
 }