diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/modules/webdatabase/Database.h')
| -rw-r--r-- | chromium/third_party/WebKit/Source/modules/webdatabase/Database.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/chromium/third_party/WebKit/Source/modules/webdatabase/Database.h b/chromium/third_party/WebKit/Source/modules/webdatabase/Database.h index 454cdec6b2e..68b33f2b344 100644 --- a/chromium/third_party/WebKit/Source/modules/webdatabase/Database.h +++ b/chromium/third_party/WebKit/Source/modules/webdatabase/Database.h @@ -48,12 +48,13 @@ class SQLTransactionCallback; class SQLTransactionErrorCallback; class VoidCallback; -class Database : public DatabaseBase, public DatabaseBackend, public ScriptWrappable { +class Database FINAL : public DatabaseBackend, public DatabaseBase, public ScriptWrappable { public: virtual ~Database(); + virtual void trace(Visitor*) OVERRIDE; // Direct support for the DOM API - virtual String version() const; + virtual String version() const OVERRIDE; void changeVersion(const String& oldVersion, const String& newVersion, PassOwnPtr<SQLTransactionCallback>, PassOwnPtr<SQLTransactionErrorCallback>, PassOwnPtr<VoidCallback> successCallback); void transaction(PassOwnPtr<SQLTransactionCallback>, PassOwnPtr<SQLTransactionErrorCallback>, PassOwnPtr<VoidCallback> successCallback); void readTransaction(PassOwnPtr<SQLTransactionCallback>, PassOwnPtr<SQLTransactionErrorCallback>, PassOwnPtr<VoidCallback> successCallback); @@ -64,17 +65,17 @@ public: Vector<String> tableNames(); - virtual SecurityOrigin* securityOrigin() const; + virtual SecurityOrigin* securityOrigin() const OVERRIDE; - virtual void closeImmediately(); + virtual void closeImmediately() OVERRIDE; void scheduleTransactionCallback(SQLTransaction*); private: - Database(PassRefPtr<DatabaseContext>, const String& name, + Database(DatabaseContext*, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize); - PassRefPtr<DatabaseBackend> backend(); - static PassRefPtr<Database> create(ExecutionContext*, PassRefPtr<DatabaseBackendBase>); + PassRefPtrWillBeRawPtr<DatabaseBackend> backend(); + static PassRefPtrWillBeRawPtr<Database> create(ExecutionContext*, PassRefPtrWillBeRawPtr<DatabaseBackendBase>); void runTransaction(PassOwnPtr<SQLTransactionCallback>, PassOwnPtr<SQLTransactionErrorCallback>, PassOwnPtr<VoidCallback> successCallback, bool readOnly, const ChangeVersionData* = 0); @@ -85,7 +86,7 @@ private: void reportCommitTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode); RefPtr<SecurityOrigin> m_databaseThreadSecurityOrigin; - RefPtr<DatabaseContext> m_databaseContext; + RefPtrWillBeMember<DatabaseContext> m_databaseContext; friend class DatabaseManager; friend class DatabaseServer; // FIXME: remove this when the backend has been split out. |