[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 94ebb928b09d3e60877c229ddf73ace192212995
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 5 15:01:33 2009 +0000

    Do not empty the offline web appcache when clearing
    memory caches. That one is not in memory, but stored
    in sqlite.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-10-05
    Reviewed by Tor Arne Vestbø.
    
    * Api/qwebsettings.cpp:
    (QWebSettings::clearMemoryCaches):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49095 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/Api/qwebsettings.cpp b/WebKit/qt/Api/qwebsettings.cpp
index eedf7d1..abd7036 100644
--- a/WebKit/qt/Api/qwebsettings.cpp
+++ b/WebKit/qt/Api/qwebsettings.cpp
@@ -628,11 +628,6 @@ void QWebSettings::clearMemoryCaches()
     // Invalidating the font cache and freeing all inactive font data.
     WebCore::fontCache()->invalidate();
 
-#if ENABLE(OFFLINE_WEB_APPLICATIONS)
-    // Empty the application cache.
-    WebCore::cacheStorage().empty();
-#endif
-
     // Empty the Cross-Origin Preflight cache
     WebCore::CrossOriginPreflightResultCache::shared().empty();
 }
diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index 179275a..82720b9 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-05  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Tor Arne Vestbø.
+
+        Do not empty the offline web appcache when clearing
+        memory caches. That one is not in memory, but stored
+        in sqlite.
+
+        * Api/qwebsettings.cpp:
+        (QWebSettings::clearMemoryCaches):
+
 2009-10-05  J-P Nurmi  <jpnurmi at gmail.com>
 
         Reviewed by Simon Hausmann.

-- 
WebKit Debian packaging