diff options
| author | Kristian Monsen <kristianm@google.com> | 2010-06-28 16:42:48 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2010-07-02 10:29:56 +0100 |
| commit | 06ea8e899e48f1f2f396b70e63fae369f2f23232 (patch) | |
| tree | 20c1428cd05c76f32394ab354ea35ed99acd86d8 /WebCore/storage/DatabaseTracker.cpp | |
| parent | 72aad67af14193199e29cdd5c4ddc095a8b9a8a8 (diff) | |
| download | external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.zip external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.gz external_webkit-06ea8e899e48f1f2f396b70e63fae369f2f23232.tar.bz2 | |
Merge WebKit at r61871: Initial merge by git.
Change-Id: I6cff43abca9cc4782e088a469ad4f03f166a65d5
Diffstat (limited to 'WebCore/storage/DatabaseTracker.cpp')
| -rw-r--r-- | WebCore/storage/DatabaseTracker.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/WebCore/storage/DatabaseTracker.cpp b/WebCore/storage/DatabaseTracker.cpp index 752dbe6..cf56ff6 100644 --- a/WebCore/storage/DatabaseTracker.cpp +++ b/WebCore/storage/DatabaseTracker.cpp @@ -31,9 +31,9 @@ #if ENABLE(DATABASE) +#include "AbstractDatabase.h" #include "Chrome.h" #include "ChromeClient.h" -#include "Database.h" #include "DatabaseThread.h" #include "DatabaseTrackerClient.h" #include "Logging.h" @@ -219,7 +219,7 @@ bool DatabaseTracker::hasEntryForDatabase(SecurityOrigin* origin, const String& return statement.step() == SQLResultRow; } -unsigned long long DatabaseTracker::getMaxSizeForDatabase(const Database* database) +unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase* database) { ASSERT(currentThread() == database->scriptExecutionContext()->databaseThread()->getThreadID()); // The maximum size for a database is the full quota for its origin, minus the current usage within the origin, @@ -230,7 +230,7 @@ unsigned long long DatabaseTracker::getMaxSizeForDatabase(const Database* databa return quotaForOriginNoLock(origin) - originQuotaManager().diskUsage(origin) + SQLiteFileSystem::getDatabaseFileSize(database->fileName()); } -void DatabaseTracker::databaseChanged(Database* database) +void DatabaseTracker::databaseChanged(AbstractDatabase* database) { Locker<OriginQuotaManager> quotaManagerLocker(originQuotaManager()); originQuotaManager().markDatabase(database); @@ -479,7 +479,7 @@ unsigned long long DatabaseTracker::usageForDatabase(const String& name, Securit return SQLiteFileSystem::getDatabaseFileSize(path); } -void DatabaseTracker::addOpenDatabase(Database* database) +void DatabaseTracker::addOpenDatabase(AbstractDatabase* database) { if (!database) return; @@ -512,7 +512,7 @@ void DatabaseTracker::addOpenDatabase(Database* database) doneCreatingDatabase(database->securityOrigin(), database->stringIdentifier()); } -void DatabaseTracker::removeOpenDatabase(Database* database) +void DatabaseTracker::removeOpenDatabase(AbstractDatabase* database) { if (!database) return; @@ -559,7 +559,7 @@ void DatabaseTracker::removeOpenDatabase(Database* database) originQuotaManager().removeOrigin(database->securityOrigin()); } -void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<Database> >* databases) +void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases) { MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard); if (!m_openDatabaseMap) @@ -973,7 +973,7 @@ bool DatabaseTracker::deleteDatabaseFile(SecurityOrigin* origin, const String& n } #endif - Vector<RefPtr<Database> > deletedDatabases; + Vector<RefPtr<AbstractDatabase> > deletedDatabases; // Make sure not to hold the any locks when calling // Database::markAsDeletedAndClose(), since that can cause a deadlock |