Changeset 64403 in webkit

Timestamp:

Jul 30, 2010 8:38:13 PM (14 years ago)

Author:

Joseph Pecoraro

Message:

2010-07-30 Joseph Pecoraro <Joseph Pecoraro>

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:

Location:

trunk/WebKit/mac

Files:

• ChangeLog (modified) (1 diff)
• Storage/WebDatabaseSecurityOrigin.mm (modified) (2 diffs)
• WebCoreSupport/WebApplicationCacheSecurityOrigin.mm (modified) (3 diffs)
• WebCoreSupport/WebSecurityOrigin.mm (modified) (2 diffs)
• WebCoreSupport/WebSecurityOriginPrivate.h (modified) (1 diff)

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-07-30  Joseph Pecoraro  <joepeck@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@webkit.org>
 

trunk/WebKit/mac/Storage/WebDatabaseSecurityOrigin.mm

@@ -25 +25 @@
 
 #import "WebDatabaseSecurityOrigin.h"
-
-#import <WebCore/DatabaseTracker.h>
 #import <WebCore/SecurityOrigin.h>
 
@@ -33 +31 @@
 @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

trunk/WebKit/mac/WebCoreSupport/WebApplicationCacheSecurityOrigin.mm

@@ -32 +32 @@
 @implementation WebApplicationCacheSecurityOrigin
 
-- (long long)usage
+- (unsigned long long)usage
 {
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -44 +44 @@
 }
 
-- (long long)quota
+- (unsigned long long)quota
 {
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)
@@ -56 +56 @@
 }
 
-- (void)setQuota:(long long)quota
+- (void)setQuota:(unsigned long long)quota
 {
 #if ENABLE(OFFLINE_WEB_APPLICATIONS)

trunk/WebKit/mac/WebCoreSupport/WebSecurityOrigin.mm

@@ -31 +31 @@
 #import <WebCore/KURL.h>
 #import <WebCore/SecurityOrigin.h>
+#import <WebCore/DatabaseTracker.h>
 
 using namespace WebCore;
@@ -69 +70 @@
 }
 
-// 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
 }
 

trunk/WebKit/mac/WebCoreSupport/WebSecurityOriginPrivate.h

@@ -43 +43 @@
 // 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