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

[joepeck at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 6300d3e79b1014599d997a6d593311a80111bcb7
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 6 00:24:48 2010 +0000

    2010-08-05  Joseph Pecoraro  <joepeck at webkit.org>
    
            Reviewed by David Kilzer.
    
            Remove Invalid Asserts for Application Cache Quotas
            https://bugs.webkit.org/show_bug.cgi?id=43585
    
            Removed Invalid ASSERTs that would always happen for quotas
            that were not noQuota().
    
            * WebView/WebPreferences.mm:
            (-[WebPreferences applicationCacheTotalQuota]):
            (-[WebPreferences applicationCacheDefaultOriginQuota]):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64802 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index 3c98152..bf82d58 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,17 @@
+2010-08-05  Joseph Pecoraro  <joepeck at webkit.org>
+
+        Reviewed by David Kilzer.
+
+        Remove Invalid Asserts for Application Cache Quotas
+        https://bugs.webkit.org/show_bug.cgi?id=43585
+
+        Removed Invalid ASSERTs that would always happen for quotas
+        that were not noQuota().
+
+        * WebView/WebPreferences.mm:
+        (-[WebPreferences applicationCacheTotalQuota]):
+        (-[WebPreferences applicationCacheDefaultOriginQuota]):
+
 2010-08-05  Gavin Barraclough  <barraclough at apple.com>
 
         Rubber stamped by Sam Weinig
diff --git a/WebKit/mac/WebView/WebPreferences.mm b/WebKit/mac/WebView/WebPreferences.mm
index 7ec2439..c46dca7 100644
--- a/WebKit/mac/WebView/WebPreferences.mm
+++ b/WebKit/mac/WebView/WebPreferences.mm
@@ -998,7 +998,6 @@ static WebCacheModel cacheModelForMainBundle(void)
 
 - (int64_t)applicationCacheTotalQuota
 {
-    ASSERT([self _longLongValueForKey:WebKitApplicationCacheTotalQuota] == [WebApplicationCache maximumSize]);
     return [self _longLongValueForKey:WebKitApplicationCacheTotalQuota];
 }
 
@@ -1012,7 +1011,6 @@ static WebCacheModel cacheModelForMainBundle(void)
 
 - (int64_t)applicationCacheDefaultOriginQuota
 {
-    ASSERT([self _longLongValueForKey:WebKitApplicationCacheDefaultOriginQuota] == [WebApplicationCache defaultOriginQuota]);
     return [self _longLongValueForKey:WebKitApplicationCacheDefaultOriginQuota];
 }
 

-- 
WebKit Debian packaging