diff options
author | Ben Murdoch <benm@google.com> | 2009-08-11 17:01:47 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2009-08-11 18:21:02 +0100 |
commit | 0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5 (patch) | |
tree | 2943df35f62d885c89d01063cc528dd73b480fea /WebCore/storage/Database.cpp | |
parent | 7e7a70bfa49a1122b2597a1e6367d89eb4035eca (diff) | |
download | external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.zip external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.gz external_webkit-0bf48ef3be53ddaa52bbead65dfd75bf90e7a2b5.tar.bz2 |
Merge in WebKit r47029.
Diffstat (limited to 'WebCore/storage/Database.cpp')
-rw-r--r-- | WebCore/storage/Database.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/WebCore/storage/Database.cpp b/WebCore/storage/Database.cpp index 3dacdd3..2292a0a 100644 --- a/WebCore/storage/Database.cpp +++ b/WebCore/storage/Database.cpp @@ -40,7 +40,6 @@ #include "DatabaseTracker.h" #include "Document.h" #include "ExceptionCode.h" -#include "FileSystem.h" #include "Frame.h" #include "InspectorController.h" #include "Logging.h" @@ -48,6 +47,7 @@ #include "Page.h" #include "OriginQuotaManager.h" #include "SQLiteDatabase.h" +#include "SQLiteFileSystem.h" #include "SQLiteStatement.h" #include "SQLResultSet.h" #include <wtf/MainThread.h> @@ -348,10 +348,7 @@ void Database::stop() unsigned long long Database::databaseSize() const { - long long size; - if (!getFileSize(m_filename, size)) - size = 0; - return size; + return SQLiteFileSystem::getDatabaseFileSize(m_filename); } unsigned long long Database::maximumSize() const |