Changeset 69084 in webkit

Timestamp:

Oct 4, 2010 11:36:44 PM (14 years ago)

Author:

tonyg@chromium.org

Message:

2010-10-04 Tony Gentilcore <​tonyg@chromium.org>

Reviewed by Darin Fisher.

[chromium] Properly clear WebKit cache when chromium cache is cleared
​https://bugs.webkit.org/show_bug.cgi?id=47119

Contributed by Ricardo Vargas.

See: ​http://code.google.com/p/chromium/issues/detail?id=54336

• src/WebCache.cpp: (WebKit::WebCache::clear):

Location:

trunk/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/WebCache.cpp (modified) (1 diff)

trunk/WebKit/chromium/ChangeLog

@@ +1 @@
+2010-10-04  Tony Gentilcore  <tonyg@chromium.org>
+
+        Reviewed by Darin Fisher.
+
+        [chromium] Properly clear WebKit cache when chromium cache is cleared
+        https://bugs.webkit.org/show_bug.cgi?id=47119
+
+        Contributed by Ricardo Vargas.
+
+        See: http://code.google.com/p/chromium/issues/detail?id=54336
+
+        * src/WebCache.cpp:
+        (WebKit::WebCache::clear):
+
 2010-10-04  Nico Weber  <thakis@chromium.org>
 

trunk/WebKit/chromium/src/WebCache.cpp

@@ -68 +68 @@
     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);
     }
 }