[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[tonyg at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 38890d75b747b4d787c059dbb4d13fc3064ca598
Author: tonyg at chromium.org <tonyg at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Oct 5 06:36:44 2010 +0000

    2010-10-04  Tony Gentilcore  <tonyg at 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):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69084 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index bc8477c..c9eab93 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2010-10-04  Tony Gentilcore  <tonyg at 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 at chromium.org>
 
         Reviewed by Kenneth Russell.
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);
     }
 }
 

-- 
WebKit Debian packaging