Changeset 56954 in webkit
- Timestamp:
- Apr 1, 2010 5:13:17 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r56953 r56954 1 2010-04-01 Ada Chan <adachan@apple.com> 2 3 Reviewed by Darin Adler. 4 5 Change DatabaseTracker::deleteOrigin() to return true if there are no errors in deleting the origin. 6 Ditto for DatabaseTracker::deleteDatabase(). 7 8 https://bugs.webkit.org/show_bug.cgi?id=36988 9 10 * storage/DatabaseTracker.cpp: 11 (WebCore::DatabaseTracker::deleteOrigin): 12 (WebCore::DatabaseTracker::deleteDatabase): 13 * storage/DatabaseTracker.h: 14 1 15 2010-04-01 Simon Fraser <simon.fraser@apple.com> 2 16 -
trunk/WebCore/storage/DatabaseTracker.cpp
r56604 r56954 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 693 693 // taking place. 694 voidDatabaseTracker::deleteOrigin(SecurityOrigin* origin)694 bool DatabaseTracker::deleteOrigin(SecurityOrigin* origin) 695 695 { 696 696 Vector<String> databaseNames; … … 699 699 openTrackerDatabase(false); 700 700 if (!m_database.isOpen()) 701 return ;701 return false; 702 702 703 703 if (!databaseNamesForOriginNoLock(origin, databaseNames)) { 704 704 LOG_ERROR("Unable to retrieve list of database names for origin %s", origin->databaseIdentifier().ascii().data()); 705 return ;705 return false; 706 706 } 707 707 if (!canDeleteOrigin(origin)) { 708 708 LOG_ERROR("Tried to delete an origin (%s) while either creating database in it or already deleting it", origin->databaseIdentifier().ascii().data()); 709 709 ASSERT(false); 710 return ;710 return false; 711 711 } 712 712 recordDeletingOrigin(origin); … … 731 731 if (statement.prepare() != SQLResultOk) { 732 732 LOG_ERROR("Unable to prepare deletion of databases from origin %s from tracker", origin->databaseIdentifier().ascii().data()); 733 return ;733 return false; 734 734 } 735 735 … … 738 738 if (!statement.executeCommand()) { 739 739 LOG_ERROR("Unable to execute deletion of databases from origin %s from tracker", origin->databaseIdentifier().ascii().data()); 740 return ;740 return false; 741 741 } 742 742 … … 744 744 if (originStatement.prepare() != SQLResultOk) { 745 745 LOG_ERROR("Unable to prepare deletion of origin %s from tracker", origin->databaseIdentifier().ascii().data()); 746 return ;746 return false; 747 747 } 748 748 … … 751 751 if (!originStatement.executeCommand()) { 752 752 LOG_ERROR("Unable to execute deletion of databases from origin %s from tracker", origin->databaseIdentifier().ascii().data()); 753 return ;753 return false; 754 754 } 755 755 … … 775 775 } 776 776 } 777 return true; 777 778 } 778 779 … … 890 891 } 891 892 892 voidDatabaseTracker::deleteDatabase(SecurityOrigin* origin, const String& name)893 bool DatabaseTracker::deleteDatabase(SecurityOrigin* origin, const String& name) 893 894 { 894 895 { … … 896 897 openTrackerDatabase(false); 897 898 if (!m_database.isOpen()) 898 return ;899 return false; 899 900 900 901 if (!canDeleteDatabase(origin, name)) { 901 902 ASSERT(FALSE); 902 return ;903 return false; 903 904 } 904 905 recordDeletingDatabase(origin, name); … … 910 911 MutexLocker lockDatabase(m_databaseGuard); 911 912 doneDeletingDatabase(origin, name); 912 return ;913 return false; 913 914 } 914 915 … … 921 922 LOG_ERROR("Unable to prepare deletion of database %s from origin %s from tracker", name.ascii().data(), origin->databaseIdentifier().ascii().data()); 922 923 doneDeletingDatabase(origin, name); 923 return ;924 return false; 924 925 } 925 926 … … 930 931 LOG_ERROR("Unable to execute deletion of database %s from origin %s from tracker", name.ascii().data(), origin->databaseIdentifier().ascii().data()); 931 932 doneDeletingDatabase(origin, name); 932 return ;933 return false; 933 934 } 934 935 … … 940 941 } 941 942 doneDeletingDatabase(origin, name); 943 944 return true; 942 945 } 943 946 -
trunk/WebCore/storage/DatabaseTracker.h
r56293 r56954 103 103 104 104 void deleteAllDatabases(); 105 voiddeleteOrigin(SecurityOrigin*);106 voiddeleteDatabase(SecurityOrigin*, const String& name);105 bool deleteOrigin(SecurityOrigin*); 106 bool deleteDatabase(SecurityOrigin*, const String& name); 107 107 108 108 void setClient(DatabaseTrackerClient*); -
trunk/WebKit/mac/ChangeLog
r56935 r56954 1 2010-04-01 Ada Chan <adachan@apple.com> 2 3 Reviewed by Darin Adler. 4 5 Change WebDatabaseManager::deleteOrigin() to return true if there are no errors in deleting the origin. 6 Ditto for WebDatabaseManager::deleteDatabase(). 7 8 https://bugs.webkit.org/show_bug.cgi?id=36988 9 10 * Storage/WebDatabaseManager.mm: 11 (-[WebDatabaseManager deleteOrigin:]): 12 (-[WebDatabaseManager deleteDatabase:withOrigin:]): 13 * Storage/WebDatabaseManagerPrivate.h: 14 1 15 2010-04-01 Alexey Proskuryakov <ap@apple.com> 2 16 -
trunk/WebKit/mac/Storage/WebDatabaseManager.mm
r43283 r56954 108 108 } 109 109 110 - ( void)deleteOrigin:(WebSecurityOrigin *)origin110 - (BOOL)deleteOrigin:(WebSecurityOrigin *)origin 111 111 { 112 DatabaseTracker::tracker().deleteOrigin([origin _core]);112 return DatabaseTracker::tracker().deleteOrigin([origin _core]); 113 113 } 114 114 115 - ( void)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin115 - (BOOL)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin 116 116 { 117 DatabaseTracker::tracker().deleteDatabase([origin _core], databaseIdentifier);117 return DatabaseTracker::tracker().deleteDatabase([origin _core], databaseIdentifier); 118 118 } 119 119 -
trunk/WebKit/mac/Storage/WebDatabaseManagerPrivate.h
r43283 r56954 61 61 62 62 - (void)deleteAllDatabases; // Deletes all databases and all origins. 63 - ( void)deleteOrigin:(WebSecurityOrigin *)origin;64 - ( void)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin;63 - (BOOL)deleteOrigin:(WebSecurityOrigin *)origin; 64 - (BOOL)deleteDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin; 65 65 66 66 @end
Note: See TracChangeset
for help on using the changeset viewer.