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

[jmalonzo at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 89245ef84484a846843f68eebb27831b8f3a722e
Author: jmalonzo at webkit.org <jmalonzo at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Oct 19 19:38:36 2009 +0000

    2009-10-19  Jan Michael Alonzo  <jmalonzo at webkit.org>
    
            Reviewed by Alexey Proskuryakov.
    
            [Gtk] ApplicationCacheStorage error while compiling WebKit/gtk/webkit/webkitapplicationcache.cpp
            https://bugs.webkit.org/show_bug.cgi?id=30358
    
            Guard calls to cacheStorage() with ENABLE(OFFLINE_WEB_APPLICATIONS).
    
            * webkit/webkitapplicationcache.cpp:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49801 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 69511ae..f621134 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,14 @@
+2009-10-19  Jan Michael Alonzo  <jmalonzo at webkit.org>
+
+        Reviewed by Alexey Proskuryakov.
+
+        [Gtk] ApplicationCacheStorage error while compiling WebKit/gtk/webkit/webkitapplicationcache.cpp
+        https://bugs.webkit.org/show_bug.cgi?id=30358
+
+        Guard calls to cacheStorage() with ENABLE(OFFLINE_WEB_APPLICATIONS).
+
+        * webkit/webkitapplicationcache.cpp:
+
 2009-10-19  Zan Dobersek  <zandobersek at gmail.com>
 
         Reviewed by Gustavo Noronha.
@@ -2100,7 +2111,7 @@
 
         Refactor how SoupMessage is handled, so that our ResourceRequest
         object doesn't have to store it as a member, which complicates
-        managing ResourceRequest's lifetime.
+        managing ResourceRequest's lifetvime.
 
         * tests/testhttpbackend.c:
         (navigation_policy_decision_requested_cb):
diff --git a/WebKit/gtk/webkit/webkitapplicationcache.cpp b/WebKit/gtk/webkit/webkitapplicationcache.cpp
index 2c6b71f..e967d34 100644
--- a/WebKit/gtk/webkit/webkitapplicationcache.cpp
+++ b/WebKit/gtk/webkit/webkitapplicationcache.cpp
@@ -20,13 +20,17 @@
 #include "config.h"
 #include "webkitprivate.h"
 
+#include <wtf/UnusedParam.h>
+
 #include "ApplicationCacheStorage.h"
 
 void webkit_application_cache_set_maximum_size(unsigned long long size)
 {
+#if ENABLE(OFFLINE_WEB_APPLICATIONS)   
     WebCore::cacheStorage().empty();
     WebCore::cacheStorage().vacuumDatabaseFile();
     WebCore::cacheStorage().setMaximumSize(size);
+#else
+    UNUSED_PARAM(size);
+#endif
 }
-
-

-- 
WebKit Debian packaging