[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 589e3b8a97287cb0ba5a956886e39b4535ac12f7
Author: joepeck at webkit.org <joepeck at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jul 31 03:38:13 2010 +0000

    2010-07-30  Joseph Pecoraro  <joepeck at webkit.org>
    
            Fix for tests that broke after r64400. Tracking a more
            ideal solution in https://bugs.webkit.org/show_bug.cgi?id=40627
    
            Switch the interface back to (unsigned long long), and move
            the WebDatabaseSecurityOrigin implementation up into WebSecurityOrigin.
            The subclasses' implementations were not getting called.
    
            * Storage/WebDatabaseSecurityOrigin.mm:
            * WebCoreSupport/WebApplicationCacheSecurityOrigin.mm:
            (-[WebApplicationCacheSecurityOrigin quota]):
            (-[WebApplicationCacheSecurityOrigin setQuota:]):
            * WebCoreSupport/WebSecurityOrigin.mm:
            (-[WebSecurityOrigin usage]):
            (-[WebSecurityOrigin quota]):
            (-[WebSecurityOrigin setQuota:]):
            * WebCoreSupport/WebSecurityOriginPrivate.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64403 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index a3fcda6..ab1fec9 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,5 +1,24 @@
 2010-07-30  Joseph Pecoraro  <joepeck at webkit.org>
 
+        Fix for tests that broke after r64400. Tracking a more
+        ideal solution in https://bugs.webkit.org/show_bug.cgi?id=40627
+
+        Switch the interface back to (unsigned long long), and move
+        the WebDatabaseSecurityOrigin implementation up into WebSecurityOrigin.
+        The subclasses' implementations were not getting called.
+
+        * Storage/WebDatabaseSecurityOrigin.mm:
+        * WebCoreSupport/WebApplicationCacheSecurityOrigin.mm:
+        (-[WebApplicationCacheSecurityOrigin quota]):
+        (-[WebApplicationCacheSecurityOrigin setQuota:]):
+        * WebCoreSupport/WebSecurityOrigin.mm:
+        (-[WebSecurityOrigin usage]):
+        (-[WebSecurityOrigin quota]):
+        (-[WebSecurityOrigin setQuota:]):
+        * WebCoreSupport/WebSecurityOriginPrivate.h:
+
+2010-07-30  Joseph Pecoraro  <joepeck at webkit.org>
+
         Reviewed by David Kilzer.
 
         Limit ApplicationCache Total and Per-Origin Storage Capacity (Quotas)
diff --git a/WebKit/mac/Storage/WebDatabaseSecurityOrigin.mm b/WebKit/mac/Storage/WebDatabaseSecurityOrigin.mm
index e91a187..a0c3529 100644
--- a/WebKit/mac/Storage/WebDatabaseSecurityOrigin.mm
+++ b/WebKit/mac/Storage/WebDatabaseSecurityOrigin.mm
@@ -24,40 +24,14 @@
  */
 
 #import "WebDatabaseSecurityOrigin.h"
-
-#import <WebCore/DatabaseTracker.h>
 #import <WebCore/SecurityOrigin.h>
 
 using namespace WebCore;
 
 @implementation WebDatabaseSecurityOrigin
 
-- (long long)usage
-{
-#if ENABLE(DATABASE)
-    return DatabaseTracker::tracker().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
-#else
-    return 0;
-#endif
-}
-
-- (long long)quota
-{
-#if ENABLE(DATABASE)
-    return DatabaseTracker::tracker().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
-#else
-    return 0;
-#endif
-}
-
-// If the quota is set to a value lower than the current usage, that quota will
-// "stick" but no data will be purged to meet the new quota. This will simply
-// prevent new data from being added to databases in that origin
-- (void)setQuota:(long long)quota
-{
-#if ENABLE(DATABASE)
-    DatabaseTracker::tracker().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota);
-#endif
-}
+// FIXME: https://bugs.webkit.org/show_bug.cgi?id=40627
+// Proper steps should be taken to have subclass implementations of SecurityOrigin's
+// origin, quota, and setQuota methods.
 
 @end
diff --git a/WebKit/mac/WebCoreSupport/WebApplicationCacheSecurityOrigin.mm b/WebKit/mac/WebCoreSupport/WebApplicationCacheSecurityOrigin.mm
index b72cdcc..dac41ae 100644
--- a/WebKit/mac/WebCoreSupport/WebApplicationCacheSecurityOrigin.mm
+++ b/WebKit/mac/WebCoreSupport/WebApplicationCacheSecurityOrigin.mm
@@ -31,7 +31,7 @@ using namespace WebCore;
 
 @implementation WebApplicationCacheSecurityOrigin
 
-- (long long)usage
+- (unsigned long long)usage
 {
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     long long usage;
@@ -43,7 +43,7 @@ using namespace WebCore;
 #endif
 }
 
-- (long long)quota
+- (unsigned long long)quota
 {
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     long long quota;
@@ -55,7 +55,7 @@ using namespace WebCore;
 #endif
 }
 
-- (void)setQuota:(long long)quota
+- (void)setQuota:(unsigned long long)quota
 {
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
     cacheStorage().storeUpdatedQuotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private), quota);
diff --git a/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm b/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
index 4fbefff..0d49445 100644
--- a/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
+++ b/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm
@@ -30,6 +30,7 @@
 
 #import <WebCore/KURL.h>
 #import <WebCore/SecurityOrigin.h>
+#import <WebCore/DatabaseTracker.h>
 
 using namespace WebCore;
 
@@ -68,21 +69,36 @@ using namespace WebCore;
     return reinterpret_cast<SecurityOrigin*>(_private)->port();
 }
 
-// Meant to be implemented in a subclass.
-- (long long)usage
+// FIXME: https://bugs.webkit.org/show_bug.cgi?id=40627
+// Proper steps should be taken to have subclass implementations of SecurityOrigin's
+// origin, quota, and setQuota methods.
+
+- (unsigned long long)usage
 {
+#if ENABLE(DATABASE)
+    return DatabaseTracker::tracker().usageForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
+#else
     return 0;
+#endif
 }
 
-// Meant to be implemented in a subclass.
-- (long long)quota
+- (unsigned long long)quota
 {
+#if ENABLE(DATABASE)
+    return DatabaseTracker::tracker().quotaForOrigin(reinterpret_cast<SecurityOrigin*>(_private));
+#else
     return 0;
+#endif
 }
 
-// Meant to be implemented in a subclass.
-- (void)setQuota:(long long)quota
+// If the quota is set to a value lower than the current usage, that quota will
+// "stick" but no data will be purged to meet the new quota. This will simply
+// prevent new data from being added to databases in that origin
+- (void)setQuota:(unsigned long long)quota
 {
+#if ENABLE(DATABASE)
+    DatabaseTracker::tracker().setQuota(reinterpret_cast<SecurityOrigin*>(_private), quota);
+#endif
 }
 
 - (BOOL)isEqual:(id)anObject
diff --git a/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h b/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h
index 26ee852..6518a16 100644
--- a/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h
+++ b/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h
@@ -42,14 +42,14 @@
 
 // Meant to be implemented in a subclass.
 // Returns the current total usage of all relevant items in this security origin in bytes.
-- (long long)usage;
+- (unsigned long long)usage;
 
 // Meant to be implemented in a subclass.
 // Returns the quota of this security origin in bytes.
-- (long long)quota;
+- (unsigned long long)quota;
 
 // Meant to be implemented in a subclass.
 // Sets the storage quota in bytes.
-- (void)setQuota:(long long)quota;
+- (void)setQuota:(unsigned long long)quota;
 
 @end

-- 
WebKit Debian packaging