Changeset 56954 in webkit

Timestamp:

Apr 1, 2010 5:13:17 PM (14 years ago)

Author:

adachan@apple.com

Message:

WebCore: Change DatabaseTracker::deleteOrigin() to return true if there are no errors in deleting the origin.
Ditto for DatabaseTracker::deleteDatabase().

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=36988

• storage/DatabaseTracker.cpp:

(WebCore::DatabaseTracker::deleteOrigin):
(WebCore::DatabaseTracker::deleteDatabase):

• storage/DatabaseTracker.h:

WebKit/mac: Change WebDatabaseManager::deleteOrigin() to return true if there are no errors in deleting the origin.
Ditto for WebDatabaseManager::deleteDatabase().

Reviewed by Darin Adler.

​https://bugs.webkit.org/show_bug.cgi?id=36988

• Storage/WebDatabaseManager.mm:

(-[WebDatabaseManager deleteOrigin:]):
(-[WebDatabaseManager deleteDatabase:withOrigin:]):

• Storage/WebDatabaseManagerPrivate.h:

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/storage/DatabaseTracker.cpp (modified) (13 diffs)
• WebCore/storage/DatabaseTracker.h (modified) (1 diff)
• WebKit/mac/ChangeLog (modified) (1 diff)
• WebKit/mac/Storage/WebDatabaseManager.mm (modified) (1 diff)
• WebKit/mac/Storage/WebDatabaseManagerPrivate.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-04-01  Ada Chan  <adachan@apple.com>
+
+        Reviewed by Darin Adler.
+        
+        Change DatabaseTracker::deleteOrigin() to return true if there are no errors in deleting the origin.
+        Ditto for DatabaseTracker::deleteDatabase().
+        
+        https://bugs.webkit.org/show_bug.cgi?id=36988
+
+        * storage/DatabaseTracker.cpp:
+        (WebCore::DatabaseTracker::deleteOrigin):
+        (WebCore::DatabaseTracker::deleteDatabase):
+        * storage/DatabaseTracker.h:
+
 2010-04-01  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/storage/DatabaseTracker.cpp

@@ -692 +692 @@
 // It is the caller's responsibility to make sure that nobody is trying to create, delete, open, or close databases in this origin while the deletion is
 // taking place.
-void DatabaseTracker::deleteOrigin(SecurityOrigin* origin)
+bool DatabaseTracker::deleteOrigin(SecurityOrigin* origin)
 {
     Vector<String> databaseNames;
@@ -699 +699 @@
         openTrackerDatabase(false);
         if (!m_database.isOpen())
-            return;
+            return false;
 
         if (!databaseNamesForOriginNoLock(origin, databaseNames)) {
             LOG_ERROR("Unable to retrieve list of database names for origin %s", origin->databaseIdentifier().ascii().data());
-            return;
+            return false;
         }
         if (!canDeleteOrigin(origin)) {
             LOG_ERROR("Tried to delete an origin (%s) while either creating database in it or already deleting it", origin->databaseIdentifier().ascii().data());
             ASSERT(false);
-            return;
+            return false;
         }
         recordDeletingOrigin(origin);
@@ -731 +731 @@
         if (statement.prepare() != SQLResultOk) {
             LOG_ERROR("Unable to prepare deletion of databases from origin %s from tracker", origin->databaseIdentifier().ascii().data());
-            return;
+            return false;
         }
 
@@ -738 +738 @@
         if (!statement.executeCommand()) {
             LOG_ERROR("Unable to execute deletion of databases from origin %s from tracker", origin->databaseIdentifier().ascii().data());
-            return;
+            return false;
         }
 
@@ -744 +744 @@
         if (originStatement.prepare() != SQLResultOk) {
             LOG_ERROR("Unable to prepare deletion of origin %s from tracker", origin->databaseIdentifier().ascii().data());
-            return;
+            return false;
         }
 
@@ -751 +751 @@
         if (!originStatement.executeCommand()) {
             LOG_ERROR("Unable to execute deletion of databases from origin %s from tracker", origin->databaseIdentifier().ascii().data());
-            return;
+            return false;
         }
 
@@ -775 +775 @@
         }
     }
+    return true;
 }
 
@@ -890 +891 @@
 }
 
-void DatabaseTracker::deleteDatabase(SecurityOrigin* origin, const String& name)
+bool DatabaseTracker::deleteDatabase(SecurityOrigin* origin, const String& name)
 {
     {
@@ -896 +897 @@
         openTrackerDatabase(false);
         if (!m_database.isOpen())
-            return;
+            return false;
 
         if (!canDeleteDatabase(origin, name)) {
             ASSERT(FALSE);
-            return;
+            return false;
         }
         recordDeletingDatabase(origin, name);
@@ -910 +911 @@
         MutexLocker lockDatabase(m_databaseGuard);
         doneDeletingDatabase(origin, name);
-        return;
+        return false;
     }
 
@@ -921 +922 @@
         LOG_ERROR("Unable to prepare deletion of database %s from origin %s from tracker", name.ascii().data(), origin->databaseIdentifier().ascii().data());
         doneDeletingDatabase(origin, name);
-        return;
+        return false;
     }
 
@@ -930 +931 @@
         LOG_ERROR("Unable to execute deletion of database %s from origin %s from tracker", name.ascii().data(), origin->databaseIdentifier().ascii().data());
         doneDeletingDatabase(origin, name);
-        return;
+        return false;
     }
 
@@ -940 +941 @@
     }
     doneDeletingDatabase(origin, name);
+    
+    return true;
 }
 

trunk/WebCore/storage/DatabaseTracker.h

@@ -103 +103 @@
 
     void deleteAllDatabases();
-    void deleteOrigin(SecurityOrigin*);
-    void deleteDatabase(SecurityOrigin*, const String& name);
+    bool deleteOrigin(SecurityOrigin*);
+    bool deleteDatabase(SecurityOrigin*, const String& name);
 
     void setClient(DatabaseTrackerClient*);

trunk/WebKit/mac/ChangeLog

@@ +1 @@
+2010-04-01  Ada Chan  <adachan@apple.com>
+
+        Reviewed by Darin Adler.
+
+        Change WebDatabaseManager::deleteOrigin() to return true if there are no errors in deleting the origin.
+        Ditto for WebDatabaseManager::deleteDatabase().
+        
+        https://bugs.webkit.org/show_bug.cgi?id=36988
+
+        * Storage/WebDatabaseManager.mm:
+        (-[WebDatabaseManager deleteOrigin:]):
+        (-[WebDatabaseManager deleteDatabase:withOrigin:]):
+        * Storage/WebDatabaseManagerPrivate.h:
+
 2010-04-01  Alexey Proskuryakov  <ap@apple.com>
 

trunk/WebKit/mac/Storage/WebDatabaseManager.mm

@@ -108 +108 @@
 }
 
-- (void)deleteOrigin:(WebSecurityOrigin *)origin
+- (BOOL)deleteOrigin:(WebSecurityOrigin *)origin
 {
-    DatabaseTracker::tracker().deleteOrigin([origin _core]);
+    return DatabaseTracker::tracker().deleteOrigin([origin _core]);
 }
 
-- (void)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin
+- (BOOL)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin
 {
-    DatabaseTracker::tracker().deleteDatabase([origin _core], databaseIdentifier);
+    return DatabaseTracker::tracker().deleteDatabase([origin _core], databaseIdentifier);
 }
 

trunk/WebKit/mac/Storage/WebDatabaseManagerPrivate.h

@@ -61 +61 @@
 
 - (void)deleteAllDatabases; // Deletes all databases and all origins.
-- (void)deleteOrigin:(WebSecurityOrigin *)origin;
-- (void)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin;
+- (BOOL)deleteOrigin:(WebSecurityOrigin *)origin;
+- (BOOL)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin;
 
 @end