diff options
| author | Ben Murdoch <benm@google.com> | 2010-05-11 18:35:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-05-14 10:23:05 +0100 |
| commit | 21939df44de1705786c545cd1bf519d47250322d (patch) | |
| tree | ef56c310f5c0cdc379c2abb2e212308a3281ce20 /WebCore/storage/Database.h | |
| parent | 4ff1d8891d520763f17675827154340c7c740f90 (diff) | |
| download | external_webkit-21939df44de1705786c545cd1bf519d47250322d.zip external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.gz external_webkit-21939df44de1705786c545cd1bf519d47250322d.tar.bz2 | |
Merge Webkit at r58956: Initial merge by Git.
Change-Id: I1d9fb60ea2c3f2ddc04c17a871acdb39353be228
Diffstat (limited to 'WebCore/storage/Database.h')
| -rw-r--r-- | WebCore/storage/Database.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/WebCore/storage/Database.h b/WebCore/storage/Database.h index f7b88a2..890d98c 100644 --- a/WebCore/storage/Database.h +++ b/WebCore/storage/Database.h @@ -73,7 +73,7 @@ public: ~Database(); -// Direct support for the DOM API + // Direct support for the DOM API static PassRefPtr<Database> openDatabase(ScriptExecutionContext* context, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize, PassRefPtr<DatabaseCallback> creationCallback, @@ -85,7 +85,7 @@ public: void transaction(PassRefPtr<SQLTransactionCallback> callback, PassRefPtr<SQLTransactionErrorCallback> errorCallback, PassRefPtr<VoidCallback> successCallback, bool readOnly); -// Internal engine support + // Internal engine support static const String& databaseInfoTableName(); void disableAuthorizer(); @@ -121,7 +121,7 @@ public: unsigned long long databaseSize() const; unsigned long long maximumSize() const; -// Called from DatabaseThread, must be prepared to work on the background thread + // Called from DatabaseThread, must be prepared to work on the background thread void resetAuthorizer(); void performPolicyChecks(); @@ -133,6 +133,8 @@ public: SQLTransactionClient* transactionClient() const; SQLTransactionCoordinator* transactionCoordinator() const; + void incrementalVacuumIfNeeded(); + private: Database(ScriptExecutionContext* context, const String& name, const String& expectedVersion, const String& displayName, |