diff options
| author | Steve Block <steveblock@google.com> | 2010-04-27 16:31:00 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-05-11 14:42:12 +0100 |
| commit | dcc8cf2e65d1aa555cce12431a16547e66b469ee (patch) | |
| tree | 92a8d65cd5383bca9749f5327fb5e440563926e6 /WebKit/mac/Storage | |
| parent | ccac38a6b48843126402088a309597e682f40fe6 (diff) | |
| download | external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.zip external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.gz external_webkit-dcc8cf2e65d1aa555cce12431a16547e66b469ee.tar.bz2 | |
Merge webkit.org at r58033 : Initial merge by git
Change-Id: If006c38561af287c50cd578d251629b51e4d8cd1
Diffstat (limited to 'WebKit/mac/Storage')
| -rw-r--r-- | WebKit/mac/Storage/WebDatabaseManager.mm | 8 | ||||
| -rw-r--r-- | WebKit/mac/Storage/WebDatabaseManagerPrivate.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/WebKit/mac/Storage/WebDatabaseManager.mm b/WebKit/mac/Storage/WebDatabaseManager.mm index a84f235..2c58889 100644 --- a/WebKit/mac/Storage/WebDatabaseManager.mm +++ b/WebKit/mac/Storage/WebDatabaseManager.mm @@ -107,14 +107,14 @@ NSString *WebDatabaseIdentifierKey = @"WebDatabaseIdentifierKey"; DatabaseTracker::tracker().deleteAllDatabases(); } -- (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); } @end diff --git a/WebKit/mac/Storage/WebDatabaseManagerPrivate.h b/WebKit/mac/Storage/WebDatabaseManagerPrivate.h index e373b1c..94d8109 100644 --- a/WebKit/mac/Storage/WebDatabaseManagerPrivate.h +++ b/WebKit/mac/Storage/WebDatabaseManagerPrivate.h @@ -60,8 +60,8 @@ extern NSString *WebDatabaseIdentifierKey; - (NSDictionary *)detailsForDatabase:(NSString *)databaseIdentifier withOrigin:(WebSecurityOrigin *)origin; - (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 |