Rename AbstractDatabase to DatabaseBackend.
authormark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Jan 2013 03:20:27 +0000 (03:20 +0000)
committermark.lam@apple.com <mark.lam@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 30 Jan 2013 03:20:27 +0000 (03:20 +0000)
https://bugs.webkit.org/show_bug.cgi?id=108275.

Reviewed by Sam Weinig.

This is a pure rename operation as part of the webdatabase refactoring
effort. There is no semantic change in this patch.

Source/WebCore:

No new tests.

* CMakeLists.txt:
* GNUmakefile.list.am:
* Modules/webdatabase/AbstractDatabase.cpp: Removed.
* Modules/webdatabase/AbstractDatabase.h: Removed.
* Modules/webdatabase/AbstractDatabaseServer.h:
(WebCore):
(AbstractDatabaseServer):
* Modules/webdatabase/DBBackendServer.cpp:
(WebCore::DBBackend::Server::databaseChanged):
(WebCore::DBBackend::Server::addOpenDatabase):
(WebCore::DBBackend::Server::removeOpenDatabase):
(WebCore::DBBackend::Server::getMaxSizeForDatabase):
* Modules/webdatabase/DBBackendServer.h:
* Modules/webdatabase/Database.cpp:
(WebCore::Database::Database):
(WebCore::Database::version):
(WebCore::Database::performOpenAndVerify):
* Modules/webdatabase/Database.h:
* Modules/webdatabase/DatabaseBackend.cpp: Copied from Source/WebCore/Modules/webdatabase/AbstractDatabase.cpp.
(WebCore):
(WebCore::DatabaseBackend::databaseInfoTableName):
(WebCore::DatabaseBackend::DatabaseBackend):
(WebCore::DatabaseBackend::~DatabaseBackend):
(WebCore::DatabaseBackend::closeDatabase):
(WebCore::DatabaseBackend::version):
(WebCore::DatabaseBackend::performOpenAndVerify):
(WebCore::DatabaseBackend::scriptExecutionContext):
(WebCore::DatabaseBackend::securityOrigin):
(WebCore::DatabaseBackend::stringIdentifier):
(WebCore::DatabaseBackend::displayName):
(WebCore::DatabaseBackend::estimatedSize):
(WebCore::DatabaseBackend::fileName):
(WebCore::DatabaseBackend::details):
(WebCore::DatabaseBackend::getVersionFromDatabase):
(WebCore::DatabaseBackend::setVersionInDatabase):
(WebCore::DatabaseBackend::setExpectedVersion):
(WebCore::DatabaseBackend::getCachedVersion):
(WebCore::DatabaseBackend::setCachedVersion):
(WebCore::DatabaseBackend::getActualVersionForTransaction):
(WebCore::DatabaseBackend::disableAuthorizer):
(WebCore::DatabaseBackend::enableAuthorizer):
(WebCore::DatabaseBackend::setAuthorizerReadOnly):
(WebCore::DatabaseBackend::setAuthorizerPermissions):
(WebCore::DatabaseBackend::lastActionChangedDatabase):
(WebCore::DatabaseBackend::lastActionWasInsert):
(WebCore::DatabaseBackend::resetDeletes):
(WebCore::DatabaseBackend::hadDeletes):
(WebCore::DatabaseBackend::resetAuthorizer):
(WebCore::DatabaseBackend::maximumSize):
(WebCore::DatabaseBackend::incrementalVacuumIfNeeded):
(WebCore::DatabaseBackend::interrupt):
(WebCore::DatabaseBackend::isInterrupted):
(WebCore::DatabaseBackend::logErrorMessage):
(WebCore::DatabaseBackend::reportOpenDatabaseResult):
(WebCore::DatabaseBackend::reportChangeVersionResult):
(WebCore::DatabaseBackend::reportStartTransactionResult):
(WebCore::DatabaseBackend::reportCommitTransactionResult):
(WebCore::DatabaseBackend::reportExecuteStatementResult):
(WebCore::DatabaseBackend::reportVacuumDatabaseResult):
* Modules/webdatabase/DatabaseBackend.h: Copied from Source/WebCore/Modules/webdatabase/AbstractDatabase.h.
(DatabaseBackend):
* Modules/webdatabase/DatabaseManager.cpp:
(WebCore::DatabaseManager::databaseChanged):
(WebCore::DatabaseManager::addOpenDatabase):
(WebCore::DatabaseManager::removeOpenDatabase):
(WebCore::DatabaseManager::getMaxSizeForDatabase):
* Modules/webdatabase/DatabaseManager.h:
(DatabaseManager):
* Modules/webdatabase/DatabaseSync.cpp:
(WebCore::DatabaseSync::DatabaseSync):
* Modules/webdatabase/DatabaseSync.h:
* Modules/webdatabase/DatabaseTracker.cpp:
(WebCore::DatabaseTracker::getMaxSizeForDatabase):
(WebCore::DatabaseTracker::databaseChanged):
(WebCore::DatabaseTracker::interruptAllDatabasesForContext):
(WebCore::DatabaseTracker::addOpenDatabase):
(WebCore::DatabaseTracker::removeOpenDatabase):
(WebCore::DatabaseTracker::getOpenDatabases):
(WebCore::DatabaseTracker::deleteDatabaseFile):
* Modules/webdatabase/DatabaseTracker.h:
(WebCore):
(DatabaseTracker):
* Modules/webdatabase/OriginQuotaManager.cpp:
(WebCore::OriginQuotaManager::markDatabase):
* Modules/webdatabase/OriginQuotaManager.h:
(WebCore):
(OriginQuotaManager):
* Modules/webdatabase/SQLTransactionClient.cpp:
(WebCore::SQLTransactionClient::didCommitWriteTransaction):
(WebCore::SQLTransactionClient::didExecuteStatement):
(WebCore::SQLTransactionClient::didExceedQuota):
* Modules/webdatabase/SQLTransactionClient.h:
(WebCore):
(SQLTransactionClient):
* Modules/webdatabase/chromium/DatabaseObserver.h:
(WebCore):
(DatabaseObserver):
* Modules/webdatabase/chromium/DatabaseTrackerChromium.cpp:
(WebCore::DatabaseTracker::addOpenDatabase):
(WebCore::NotifyDatabaseObserverOnCloseTask::create):
(WebCore::NotifyDatabaseObserverOnCloseTask::NotifyDatabaseObserverOnCloseTask):
(NotifyDatabaseObserverOnCloseTask):
(WebCore::DatabaseTracker::removeOpenDatabase):
(WebCore::DatabaseTracker::getMaxSizeForDatabase):
(WebCore::DatabaseTracker::CloseOneDatabaseImmediatelyTask::create):
(WebCore::DatabaseTracker::CloseOneDatabaseImmediatelyTask::CloseOneDatabaseImmediatelyTask):
(DatabaseTracker::CloseOneDatabaseImmediatelyTask):
(WebCore::DatabaseTracker::closeOneDatabaseImmediately):
* Modules/webdatabase/chromium/SQLTransactionClientChromium.cpp:
(WebCore::NotifyDatabaseChangedTask::create):
(WebCore::NotifyDatabaseChangedTask::NotifyDatabaseChangedTask):
(NotifyDatabaseChangedTask):
(WebCore::SQLTransactionClient::didCommitWriteTransaction):
(WebCore::SQLTransactionClient::didExecuteStatement):
(WebCore::SQLTransactionClient::didExceedQuota):
* Target.pri:
* WebCore.gypi:
* WebCore.order:
* WebCore.vcproj/WebCore.vcproj:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.xcodeproj/project.pbxproj:

Source/WebKit/chromium:

* public/WebDatabase.h:
(WebDatabase):
* src/DatabaseObserver.cpp:
(WebCore::DatabaseObserver::databaseOpened):
(WebCore::DatabaseObserver::databaseModified):
(WebCore::DatabaseObserver::databaseClosed):
(WebCore::DatabaseObserver::reportOpenDatabaseResult):
(WebCore::DatabaseObserver::reportChangeVersionResult):
(WebCore::DatabaseObserver::reportStartTransactionResult):
(WebCore::DatabaseObserver::reportCommitTransactionResult):
(WebCore::DatabaseObserver::reportExecuteStatementResult):
(WebCore::DatabaseObserver::reportVacuumDatabaseResult):
* src/WebDatabase.cpp:
(WebKit::WebDatabase::WebDatabase):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@141207 268f45cc-cd09-0410-ab3c-d52691b4dbfc

34 files changed:
Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog
Source/WebCore/GNUmakefile.list.am
Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h
Source/WebCore/Modules/webdatabase/DBBackendServer.cpp
Source/WebCore/Modules/webdatabase/DBBackendServer.h
Source/WebCore/Modules/webdatabase/Database.cpp
Source/WebCore/Modules/webdatabase/Database.h
Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp [moved from Source/WebCore/Modules/webdatabase/AbstractDatabase.cpp with 85% similarity]
Source/WebCore/Modules/webdatabase/DatabaseBackend.h [moved from Source/WebCore/Modules/webdatabase/AbstractDatabase.h with 93% similarity]
Source/WebCore/Modules/webdatabase/DatabaseManager.cpp
Source/WebCore/Modules/webdatabase/DatabaseManager.h
Source/WebCore/Modules/webdatabase/DatabaseSync.cpp
Source/WebCore/Modules/webdatabase/DatabaseSync.h
Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp
Source/WebCore/Modules/webdatabase/DatabaseTracker.h
Source/WebCore/Modules/webdatabase/OriginQuotaManager.cpp
Source/WebCore/Modules/webdatabase/OriginQuotaManager.h
Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp
Source/WebCore/Modules/webdatabase/SQLTransactionClient.h
Source/WebCore/Modules/webdatabase/chromium/DatabaseObserver.h
Source/WebCore/Modules/webdatabase/chromium/DatabaseTrackerChromium.cpp
Source/WebCore/Modules/webdatabase/chromium/SQLTransactionClientChromium.cpp
Source/WebCore/Target.pri
Source/WebCore/WebCore.gypi
Source/WebCore/WebCore.order
Source/WebCore/WebCore.vcproj/WebCore.vcproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
Source/WebCore/WebCore.xcodeproj/project.pbxproj
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/public/WebDatabase.h
Source/WebKit/chromium/src/DatabaseObserver.cpp
Source/WebKit/chromium/src/WebDatabase.cpp

index ceca4fc..216b611 100644 (file)
@@ -944,11 +944,11 @@ set(WebCore_SOURCES
     Modules/webaudio/WaveShaperProcessor.cpp
     Modules/webaudio/WaveTable.cpp
 
-    Modules/webdatabase/AbstractDatabase.cpp
     Modules/webdatabase/ChangeVersionWrapper.cpp
     Modules/webdatabase/DOMWindowWebDatabase.cpp
     Modules/webdatabase/Database.cpp
     Modules/webdatabase/DatabaseAuthorizer.cpp
+    Modules/webdatabase/DatabaseBackend.cpp
     Modules/webdatabase/DatabaseContext.cpp
     Modules/webdatabase/DatabaseManager.cpp
     Modules/webdatabase/DatabaseSync.cpp
index da8997b..a7e6c05 100644 (file)
@@ -1,3 +1,138 @@
+2013-01-29  Mark Lam  <mark.lam@apple.com>
+
+        Rename AbstractDatabase to DatabaseBackend.
+        https://bugs.webkit.org/show_bug.cgi?id=108275.
+
+        Reviewed by Sam Weinig.
+
+        This is a pure rename operation as part of the webdatabase refactoring
+        effort. There is no semantic change in this patch.
+
+        No new tests.
+
+        * CMakeLists.txt:
+        * GNUmakefile.list.am:
+        * Modules/webdatabase/AbstractDatabase.cpp: Removed.
+        * Modules/webdatabase/AbstractDatabase.h: Removed.
+        * Modules/webdatabase/AbstractDatabaseServer.h:
+        (WebCore):
+        (AbstractDatabaseServer):
+        * Modules/webdatabase/DBBackendServer.cpp:
+        (WebCore::DBBackend::Server::databaseChanged):
+        (WebCore::DBBackend::Server::addOpenDatabase):
+        (WebCore::DBBackend::Server::removeOpenDatabase):
+        (WebCore::DBBackend::Server::getMaxSizeForDatabase):
+        * Modules/webdatabase/DBBackendServer.h:
+        * Modules/webdatabase/Database.cpp:
+        (WebCore::Database::Database):
+        (WebCore::Database::version):
+        (WebCore::Database::performOpenAndVerify):
+        * Modules/webdatabase/Database.h:
+        * Modules/webdatabase/DatabaseBackend.cpp: Copied from Source/WebCore/Modules/webdatabase/AbstractDatabase.cpp.
+        (WebCore):
+        (WebCore::DatabaseBackend::databaseInfoTableName):
+        (WebCore::DatabaseBackend::DatabaseBackend):
+        (WebCore::DatabaseBackend::~DatabaseBackend):
+        (WebCore::DatabaseBackend::closeDatabase):
+        (WebCore::DatabaseBackend::version):
+        (WebCore::DatabaseBackend::performOpenAndVerify):
+        (WebCore::DatabaseBackend::scriptExecutionContext):
+        (WebCore::DatabaseBackend::securityOrigin):
+        (WebCore::DatabaseBackend::stringIdentifier):
+        (WebCore::DatabaseBackend::displayName):
+        (WebCore::DatabaseBackend::estimatedSize):
+        (WebCore::DatabaseBackend::fileName):
+        (WebCore::DatabaseBackend::details):
+        (WebCore::DatabaseBackend::getVersionFromDatabase):
+        (WebCore::DatabaseBackend::setVersionInDatabase):
+        (WebCore::DatabaseBackend::setExpectedVersion):
+        (WebCore::DatabaseBackend::getCachedVersion):
+        (WebCore::DatabaseBackend::setCachedVersion):
+        (WebCore::DatabaseBackend::getActualVersionForTransaction):
+        (WebCore::DatabaseBackend::disableAuthorizer):
+        (WebCore::DatabaseBackend::enableAuthorizer):
+        (WebCore::DatabaseBackend::setAuthorizerReadOnly):
+        (WebCore::DatabaseBackend::setAuthorizerPermissions):
+        (WebCore::DatabaseBackend::lastActionChangedDatabase):
+        (WebCore::DatabaseBackend::lastActionWasInsert):
+        (WebCore::DatabaseBackend::resetDeletes):
+        (WebCore::DatabaseBackend::hadDeletes):
+        (WebCore::DatabaseBackend::resetAuthorizer):
+        (WebCore::DatabaseBackend::maximumSize):
+        (WebCore::DatabaseBackend::incrementalVacuumIfNeeded):
+        (WebCore::DatabaseBackend::interrupt):
+        (WebCore::DatabaseBackend::isInterrupted):
+        (WebCore::DatabaseBackend::logErrorMessage):
+        (WebCore::DatabaseBackend::reportOpenDatabaseResult):
+        (WebCore::DatabaseBackend::reportChangeVersionResult):
+        (WebCore::DatabaseBackend::reportStartTransactionResult):
+        (WebCore::DatabaseBackend::reportCommitTransactionResult):
+        (WebCore::DatabaseBackend::reportExecuteStatementResult):
+        (WebCore::DatabaseBackend::reportVacuumDatabaseResult):
+        * Modules/webdatabase/DatabaseBackend.h: Copied from Source/WebCore/Modules/webdatabase/AbstractDatabase.h.
+        (DatabaseBackend):
+        * Modules/webdatabase/DatabaseManager.cpp:
+        (WebCore::DatabaseManager::databaseChanged):
+        (WebCore::DatabaseManager::addOpenDatabase):
+        (WebCore::DatabaseManager::removeOpenDatabase):
+        (WebCore::DatabaseManager::getMaxSizeForDatabase):
+        * Modules/webdatabase/DatabaseManager.h:
+        (DatabaseManager):
+        * Modules/webdatabase/DatabaseSync.cpp:
+        (WebCore::DatabaseSync::DatabaseSync):
+        * Modules/webdatabase/DatabaseSync.h:
+        * Modules/webdatabase/DatabaseTracker.cpp:
+        (WebCore::DatabaseTracker::getMaxSizeForDatabase):
+        (WebCore::DatabaseTracker::databaseChanged):
+        (WebCore::DatabaseTracker::interruptAllDatabasesForContext):
+        (WebCore::DatabaseTracker::addOpenDatabase):
+        (WebCore::DatabaseTracker::removeOpenDatabase):
+        (WebCore::DatabaseTracker::getOpenDatabases):
+        (WebCore::DatabaseTracker::deleteDatabaseFile):
+        * Modules/webdatabase/DatabaseTracker.h:
+        (WebCore):
+        (DatabaseTracker):
+        * Modules/webdatabase/OriginQuotaManager.cpp:
+        (WebCore::OriginQuotaManager::markDatabase):
+        * Modules/webdatabase/OriginQuotaManager.h:
+        (WebCore):
+        (OriginQuotaManager):
+        * Modules/webdatabase/SQLTransactionClient.cpp:
+        (WebCore::SQLTransactionClient::didCommitWriteTransaction):
+        (WebCore::SQLTransactionClient::didExecuteStatement):
+        (WebCore::SQLTransactionClient::didExceedQuota):
+        * Modules/webdatabase/SQLTransactionClient.h:
+        (WebCore):
+        (SQLTransactionClient):
+        * Modules/webdatabase/chromium/DatabaseObserver.h:
+        (WebCore):
+        (DatabaseObserver):
+        * Modules/webdatabase/chromium/DatabaseTrackerChromium.cpp:
+        (WebCore::DatabaseTracker::addOpenDatabase):
+        (WebCore::NotifyDatabaseObserverOnCloseTask::create):
+        (WebCore::NotifyDatabaseObserverOnCloseTask::NotifyDatabaseObserverOnCloseTask):
+        (NotifyDatabaseObserverOnCloseTask):
+        (WebCore::DatabaseTracker::removeOpenDatabase):
+        (WebCore::DatabaseTracker::getMaxSizeForDatabase):
+        (WebCore::DatabaseTracker::CloseOneDatabaseImmediatelyTask::create):
+        (WebCore::DatabaseTracker::CloseOneDatabaseImmediatelyTask::CloseOneDatabaseImmediatelyTask):
+        (DatabaseTracker::CloseOneDatabaseImmediatelyTask):
+        (WebCore::DatabaseTracker::closeOneDatabaseImmediately):
+        * Modules/webdatabase/chromium/SQLTransactionClientChromium.cpp:
+        (WebCore::NotifyDatabaseChangedTask::create):
+        (WebCore::NotifyDatabaseChangedTask::NotifyDatabaseChangedTask):
+        (NotifyDatabaseChangedTask):
+        (WebCore::SQLTransactionClient::didCommitWriteTransaction):
+        (WebCore::SQLTransactionClient::didExecuteStatement):
+        (WebCore::SQLTransactionClient::didExceedQuota):
+        * Target.pri:
+        * WebCore.gypi:
+        * WebCore.order:
+        * WebCore.vcproj/WebCore.vcproj:
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.xcodeproj/project.pbxproj:
+
 2013-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r140983.
index fd17ed5..acfce64 100644 (file)
@@ -2092,8 +2092,6 @@ webcore_modules_sources += \
        Source/WebCore/Modules/webaudio/WaveShaperNode.h \
        Source/WebCore/Modules/webaudio/WaveTable.cpp \
        Source/WebCore/Modules/webaudio/WaveTable.h \
-       Source/WebCore/Modules/webdatabase/AbstractDatabase.cpp \
-       Source/WebCore/Modules/webdatabase/AbstractDatabase.h \
        Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h \
        Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp \
        Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.h \
@@ -2103,6 +2101,8 @@ webcore_modules_sources += \
        Source/WebCore/Modules/webdatabase/Database.h \
        Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.cpp \
        Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.h \
+       Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp \
+       Source/WebCore/Modules/webdatabase/DatabaseBackend.h \
        Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h \
        Source/WebCore/Modules/webdatabase/DatabaseCallback.h \
        Source/WebCore/Modules/webdatabase/DatabaseContext.cpp \
index 6049793..3da7e80 100644 (file)
@@ -35,7 +35,7 @@
 
 namespace WebCore {
 
-class AbstractDatabase;
+class DatabaseBackend;
 class DatabaseManagerClient;
 class ScriptExecutionContext;
 class SecurityOrigin;
@@ -67,7 +67,7 @@ public:
 
     // From a secondary thread, must be thread safe with its data
     virtual void scheduleNotifyDatabaseChanged(SecurityOrigin*, const String& name) = 0;
-    virtual void databaseChanged(AbstractDatabase*) = 0;
+    virtual void databaseChanged(DatabaseBackend*) = 0;
 
 #else // PLATFORM(CHROMIUM)
     virtual void closeDatabasesImmediately(const String& originIdentifier, const String& name) = 0;
@@ -76,11 +76,11 @@ public:
     virtual void interruptAllDatabasesForContext(const ScriptExecutionContext*) = 0;
 
     virtual bool canEstablishDatabase(ScriptExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize) = 0;
-    virtual void addOpenDatabase(AbstractDatabase*) = 0;
-    virtual void removeOpenDatabase(AbstractDatabase*) = 0;
+    virtual void addOpenDatabase(DatabaseBackend*) = 0;
+    virtual void removeOpenDatabase(DatabaseBackend*) = 0;
 
     virtual void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize) = 0;
-    virtual unsigned long long getMaxSizeForDatabase(const AbstractDatabase*) = 0;
+    virtual unsigned long long getMaxSizeForDatabase(const DatabaseBackend*) = 0;
 
 protected:
     AbstractDatabaseServer() { }
index 78f4144..7875492 100644 (file)
@@ -130,7 +130,7 @@ void Server::scheduleNotifyDatabaseChanged(SecurityOrigin* origin, const String&
     DatabaseTracker::tracker().scheduleNotifyDatabaseChanged(origin, name);
 }
 
-void Server::databaseChanged(AbstractDatabase* database)
+void Server::databaseChanged(DatabaseBackend* database)
 {
     DatabaseTracker::tracker().databaseChanged(database);
 }
@@ -152,12 +152,12 @@ bool Server::canEstablishDatabase(ScriptExecutionContext* context, const String&
     return DatabaseTracker::tracker().canEstablishDatabase(context, name, displayName, estimatedSize);
 }
 
-void Server::addOpenDatabase(AbstractDatabase* database)
+void Server::addOpenDatabase(DatabaseBackend* database)
 {
     DatabaseTracker::tracker().addOpenDatabase(database);
 }
 
-void Server::removeOpenDatabase(AbstractDatabase* database)
+void Server::removeOpenDatabase(DatabaseBackend* database)
 {
     DatabaseTracker::tracker().removeOpenDatabase(database);
 }
@@ -167,7 +167,7 @@ void Server::setDatabaseDetails(SecurityOrigin* origin, const String& name, cons
     DatabaseTracker::tracker().setDatabaseDetails(origin, name, displayName, estimatedSize);
 }
 
-unsigned long long Server::getMaxSizeForDatabase(const AbstractDatabase* database)
+unsigned long long Server::getMaxSizeForDatabase(const DatabaseBackend* database)
 {
     return DatabaseTracker::tracker().getMaxSizeForDatabase(database);
 }
index 36f674b..27a24e4 100644 (file)
@@ -63,7 +63,7 @@ public:
 
     // From a secondary thread, must be thread safe with its data
     virtual void scheduleNotifyDatabaseChanged(SecurityOrigin*, const String& name);
-    virtual void databaseChanged(AbstractDatabase*);
+    virtual void databaseChanged(DatabaseBackend*);
 
 #else // PLATFORM(CHROMIUM)
     virtual void closeDatabasesImmediately(const String& originIdentifier, const String& name);
@@ -72,11 +72,11 @@ public:
     virtual void interruptAllDatabasesForContext(const ScriptExecutionContext*);
 
     virtual bool canEstablishDatabase(ScriptExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize);
-    virtual void addOpenDatabase(AbstractDatabase*);
-    virtual void removeOpenDatabase(AbstractDatabase*);
+    virtual void addOpenDatabase(DatabaseBackend*);
+    virtual void removeOpenDatabase(DatabaseBackend*);
 
     virtual void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize);
-    virtual unsigned long long getMaxSizeForDatabase(const AbstractDatabase*);
+    virtual unsigned long long getMaxSizeForDatabase(const DatabaseBackend*);
 };
 
 } // namespace DBBackend
index b7a86ff..965c66b 100644 (file)
@@ -66,7 +66,7 @@
 namespace WebCore {
 
 Database::Database(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize)
-    : AbstractDatabase(databaseContext, name, expectedVersion, displayName, estimatedSize, AsyncDatabase)
+    : DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, AsyncDatabase)
     , m_transactionInProgress(false)
     , m_isTransactionQueueEnabled(true)
     , m_deleted(false)
@@ -117,7 +117,7 @@ String Database::version() const
 {
     if (m_deleted)
         return String();
-    return AbstractDatabase::version();
+    return DatabaseBackend::version();
 }
 
 bool Database::openAndVerifyVersion(bool setVersionInNewDatabase, ExceptionCode& e, String& errorMessage)
@@ -191,7 +191,7 @@ unsigned long long Database::maximumSize() const
 
 bool Database::performOpenAndVerify(bool setVersionInNewDatabase, ExceptionCode& e, String& errorMessage)
 {
-    if (AbstractDatabase::performOpenAndVerify(setVersionInNewDatabase, e, errorMessage)) {
+    if (DatabaseBackend::performOpenAndVerify(setVersionInNewDatabase, e, errorMessage)) {
         if (databaseContext()->databaseThread())
             databaseContext()->databaseThread()->recordDatabaseOpen(this);
 
index 10d9745..0703b3f 100644 (file)
@@ -31,7 +31,7 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
+#include "DatabaseBackend.h"
 #include "DatabaseBasicTypes.h"
 #include <wtf/Deque.h>
 #include <wtf/Forward.h>
@@ -49,7 +49,7 @@ class SQLTransactionErrorCallback;
 class SQLTransactionWrapper;
 class VoidCallback;
 
-class Database : public AbstractDatabase {
+class Database : public DatabaseBackend {
 public:
     virtual ~Database();
 
@@ -27,7 +27,7 @@
  */
 
 #include "config.h"
-#include "AbstractDatabase.h"
+#include "DatabaseBackend.h"
 
 #if ENABLE(SQL_DATABASE)
 
@@ -140,7 +140,7 @@ static inline void updateGuidVersionMap(DatabaseGuid guid, String newVersion)
     guidToVersionMap().set(guid, newVersion.isEmpty() ? String() : newVersion.isolatedCopy());
 }
 
-typedef HashMap<DatabaseGuid, HashSet<AbstractDatabase*>*> GuidDatabaseMap;
+typedef HashMap<DatabaseGuid, HashSet<DatabaseBackend*>*> GuidDatabaseMap;
 static GuidDatabaseMap& guidToDatabaseMap()
 {
     // Ensure the the mutex is locked.
@@ -169,13 +169,13 @@ static DatabaseGuid guidForOriginAndName(const String& origin, const String& nam
 }
 
 // static
-const char* AbstractDatabase::databaseInfoTableName()
+const char* DatabaseBackend::databaseInfoTableName()
 {
     return infoTableName;
 }
 
-AbstractDatabase::AbstractDatabase(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion,
-                                   const String& displayName, unsigned long estimatedSize, DatabaseType databaseType)
+DatabaseBackend::DatabaseBackend(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion,
+    const String& displayName, unsigned long estimatedSize, DatabaseType databaseType)
     : m_databaseContext(databaseContext)
     , m_scriptExecutionContext(m_databaseContext->scriptExecutionContext())
     , m_name(name.isolatedCopy())
@@ -198,9 +198,9 @@ AbstractDatabase::AbstractDatabase(PassRefPtr<DatabaseContext> databaseContext,
     {
         MutexLocker locker(guidMutex());
         m_guid = guidForOriginAndName(securityOrigin()->toString(), name);
-        HashSet<AbstractDatabase*>* hashSet = guidToDatabaseMap().get(m_guid);
+        HashSet<DatabaseBackend*>* hashSet = guidToDatabaseMap().get(m_guid);
         if (!hashSet) {
-            hashSet = new HashSet<AbstractDatabase*>;
+            hashSet = new HashSet<DatabaseBackend*>;
             guidToDatabaseMap().set(m_guid, hashSet);
         }
 
@@ -211,12 +211,12 @@ AbstractDatabase::AbstractDatabase(PassRefPtr<DatabaseContext> databaseContext,
     DatabaseManager::manager().addOpenDatabase(this);
 }
 
-AbstractDatabase::~AbstractDatabase()
+DatabaseBackend::~DatabaseBackend()
 {
     ASSERT(!m_opened);
 }
 
-void AbstractDatabase::closeDatabase()
+void DatabaseBackend::closeDatabase()
 {
     if (!m_opened)
         return;
@@ -226,7 +226,7 @@ void AbstractDatabase::closeDatabase()
     {
         MutexLocker locker(guidMutex());
 
-        HashSet<AbstractDatabase*>* hashSet = guidToDatabaseMap().get(m_guid);
+        HashSet<DatabaseBackend*>* hashSet = guidToDatabaseMap().get(m_guid);
         ASSERT(hashSet);
         ASSERT(hashSet->contains(this));
         hashSet->remove(this);
@@ -238,7 +238,7 @@ void AbstractDatabase::closeDatabase()
     }
 }
 
-String AbstractDatabase::version() const
+String DatabaseBackend::version() const
 {
     // Note: In multi-process browsers the cached value may be accurate, but we cannot read the
     // actual version from the database without potentially inducing a deadlock.
@@ -246,7 +246,7 @@ String AbstractDatabase::version() const
     return getCachedVersion();
 }
 
-bool AbstractDatabase::performOpenAndVerify(bool shouldSetVersionInNewDatabase, ExceptionCode& ec, String& errorMessage)
+bool DatabaseBackend::performOpenAndVerify(bool shouldSetVersionInNewDatabase, ExceptionCode& ec, String& errorMessage)
 {
     ASSERT(errorMessage.isEmpty());
 
@@ -369,45 +369,45 @@ bool AbstractDatabase::performOpenAndVerify(bool shouldSetVersionInNewDatabase,
     return true;
 }
 
-ScriptExecutionContext* AbstractDatabase::scriptExecutionContext() const
+ScriptExecutionContext* DatabaseBackend::scriptExecutionContext() const
 {
     return m_scriptExecutionContext.get();
 }
 
-SecurityOrigin* AbstractDatabase::securityOrigin() const
+SecurityOrigin* DatabaseBackend::securityOrigin() const
 {
     return m_contextThreadSecurityOrigin.get();
 }
 
-String AbstractDatabase::stringIdentifier() const
+String DatabaseBackend::stringIdentifier() const
 {
     // Return a deep copy for ref counting thread safety
     return m_name.isolatedCopy();
 }
 
-String AbstractDatabase::displayName() const
+String DatabaseBackend::displayName() const
 {
     // Return a deep copy for ref counting thread safety
     return m_displayName.isolatedCopy();
 }
 
-unsigned long AbstractDatabase::estimatedSize() const
+unsigned long DatabaseBackend::estimatedSize() const
 {
     return m_estimatedSize;
 }
 
-String AbstractDatabase::fileName() const
+String DatabaseBackend::fileName() const
 {
     // Return a deep copy for ref counting thread safety
     return m_filename.isolatedCopy();
 }
 
-DatabaseDetails AbstractDatabase::details() const
+DatabaseDetails DatabaseBackend::details() const
 {
     return DatabaseDetails(stringIdentifier(), displayName(), estimatedSize(), 0);
 }
 
-bool AbstractDatabase::getVersionFromDatabase(String& version, bool shouldCacheVersion)
+bool DatabaseBackend::getVersionFromDatabase(String& version, bool shouldCacheVersion)
 {
     String query(String("SELECT value FROM ") + infoTableName +  " WHERE key = '" + versionKey + "';");
 
@@ -425,7 +425,7 @@ bool AbstractDatabase::getVersionFromDatabase(String& version, bool shouldCacheV
     return result;
 }
 
-bool AbstractDatabase::setVersionInDatabase(const String& version, bool shouldCacheVersion)
+bool DatabaseBackend::setVersionInDatabase(const String& version, bool shouldCacheVersion)
 {
     // The INSERT will replace an existing entry for the database with the new version number, due to the UNIQUE ON CONFLICT REPLACE
     // clause in the CREATE statement (see Database::performOpenAndVerify()).
@@ -445,25 +445,25 @@ bool AbstractDatabase::setVersionInDatabase(const String& version, bool shouldCa
     return result;
 }
 
-void AbstractDatabase::setExpectedVersion(const String& version)
+void DatabaseBackend::setExpectedVersion(const String& version)
 {
     m_expectedVersion = version.isolatedCopy();
 }
 
-String AbstractDatabase::getCachedVersion() const
+String DatabaseBackend::getCachedVersion() const
 {
     MutexLocker locker(guidMutex());
     return guidToVersionMap().get(m_guid).isolatedCopy();
 }
 
-void AbstractDatabase::setCachedVersion(const String& actualVersion)
+void DatabaseBackend::setCachedVersion(const String& actualVersion)
 {
     // Update the in memory database version map.
     MutexLocker locker(guidMutex());
     updateGuidVersionMap(m_guid, actualVersion);
 }
 
-bool AbstractDatabase::getActualVersionForTransaction(String &actualVersion)
+bool DatabaseBackend::getActualVersionForTransaction(String &actualVersion)
 {
     ASSERT(m_sqliteDatabase.transactionInProgress());
 #if PLATFORM(CHROMIUM)
@@ -476,66 +476,66 @@ bool AbstractDatabase::getActualVersionForTransaction(String &actualVersion)
 #endif
 }
 
-void AbstractDatabase::disableAuthorizer()
+void DatabaseBackend::disableAuthorizer()
 {
     ASSERT(m_databaseAuthorizer);
     m_databaseAuthorizer->disable();
 }
 
-void AbstractDatabase::enableAuthorizer()
+void DatabaseBackend::enableAuthorizer()
 {
     ASSERT(m_databaseAuthorizer);
     m_databaseAuthorizer->enable();
 }
 
-void AbstractDatabase::setAuthorizerReadOnly()
+void DatabaseBackend::setAuthorizerReadOnly()
 {
     ASSERT(m_databaseAuthorizer);
     m_databaseAuthorizer->setReadOnly();
 }
 
-void AbstractDatabase::setAuthorizerPermissions(int permissions)
+void DatabaseBackend::setAuthorizerPermissions(int permissions)
 {
     ASSERT(m_databaseAuthorizer);
     m_databaseAuthorizer->setPermissions(permissions);
 }
 
-bool AbstractDatabase::lastActionChangedDatabase()
+bool DatabaseBackend::lastActionChangedDatabase()
 {
     ASSERT(m_databaseAuthorizer);
     return m_databaseAuthorizer->lastActionChangedDatabase();
 }
 
-bool AbstractDatabase::lastActionWasInsert()
+bool DatabaseBackend::lastActionWasInsert()
 {
     ASSERT(m_databaseAuthorizer);
     return m_databaseAuthorizer->lastActionWasInsert();
 }
 
-void AbstractDatabase::resetDeletes()
+void DatabaseBackend::resetDeletes()
 {
     ASSERT(m_databaseAuthorizer);
     m_databaseAuthorizer->resetDeletes();
 }
 
-bool AbstractDatabase::hadDeletes()
+bool DatabaseBackend::hadDeletes()
 {
     ASSERT(m_databaseAuthorizer);
     return m_databaseAuthorizer->hadDeletes();
 }
 
-void AbstractDatabase::resetAuthorizer()
+void DatabaseBackend::resetAuthorizer()
 {
     if (m_databaseAuthorizer)
         m_databaseAuthorizer->reset();
 }
 
-unsigned long long AbstractDatabase::maximumSize() const
+unsigned long long DatabaseBackend::maximumSize() const
 {
     return DatabaseManager::manager().getMaxSizeForDatabase(this);
 }
 
-void AbstractDatabase::incrementalVacuumIfNeeded()
+void DatabaseBackend::incrementalVacuumIfNeeded()
 {
     int64_t freeSpaceSize = m_sqliteDatabase.freeSpaceSize();
     int64_t totalSize = m_sqliteDatabase.totalSize();
@@ -547,18 +547,18 @@ void AbstractDatabase::incrementalVacuumIfNeeded()
     }
 }
 
-void AbstractDatabase::interrupt()
+void DatabaseBackend::interrupt()
 {
     m_sqliteDatabase.interrupt();
 }
 
-bool AbstractDatabase::isInterrupted()
+bool DatabaseBackend::isInterrupted()
 {
     MutexLocker locker(m_sqliteDatabase.databaseMutex());
     return m_sqliteDatabase.isInterrupted();
 }
 
-void AbstractDatabase::logErrorMessage(const String& message)
+void DatabaseBackend::logErrorMessage(const String& message)
 {
     m_scriptExecutionContext->addConsoleMessage(OtherMessageSource, ErrorMessageLevel, message);
 }
@@ -566,43 +566,43 @@ void AbstractDatabase::logErrorMessage(const String& message)
 #if PLATFORM(CHROMIUM)
 // These are used to generate histograms of errors seen with websql.
 // See about:histograms in chromium.
-void AbstractDatabase::reportOpenDatabaseResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseBackend::reportOpenDatabaseResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     DatabaseObserver::reportOpenDatabaseResult(this, errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void AbstractDatabase::reportChangeVersionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseBackend::reportChangeVersionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     DatabaseObserver::reportChangeVersionResult(this, errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void AbstractDatabase::reportStartTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseBackend::reportStartTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     DatabaseObserver::reportStartTransactionResult(this, errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void AbstractDatabase::reportCommitTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseBackend::reportCommitTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     DatabaseObserver::reportCommitTransactionResult(this, errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void AbstractDatabase::reportExecuteStatementResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseBackend::reportExecuteStatementResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     DatabaseObserver::reportExecuteStatementResult(this, errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void AbstractDatabase::reportVacuumDatabaseResult(int sqliteErrorCode)
+void DatabaseBackend::reportVacuumDatabaseResult(int sqliteErrorCode)
 {
     DatabaseObserver::reportVacuumDatabaseResult(this, sqliteErrorCode);
 }
 
 #else
-void AbstractDatabase::reportOpenDatabaseResult(int, int, int) { }
-void AbstractDatabase::reportChangeVersionResult(int, int, int) { }
-void AbstractDatabase::reportStartTransactionResult(int, int, int) { }
-void AbstractDatabase::reportCommitTransactionResult(int, int, int) { }
-void AbstractDatabase::reportExecuteStatementResult(int, int, int) { }
-void AbstractDatabase::reportVacuumDatabaseResult(int) { }
+void DatabaseBackend::reportOpenDatabaseResult(int, int, int) { }
+void DatabaseBackend::reportChangeVersionResult(int, int, int) { }
+void DatabaseBackend::reportStartTransactionResult(int, int, int) { }
+void DatabaseBackend::reportCommitTransactionResult(int, int, int) { }
+void DatabaseBackend::reportExecuteStatementResult(int, int, int) { }
+void DatabaseBackend::reportVacuumDatabaseResult(int) { }
 #endif // PLATFORM(CHROMIUM)
 
 } // namespace WebCore
@@ -26,8 +26,8 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef AbstractDatabase_h
-#define AbstractDatabase_h
+#ifndef DatabaseBackend_h
+#define DatabaseBackend_h
 
 #if ENABLE(SQL_DATABASE)
 
@@ -50,9 +50,9 @@ class DatabaseContext;
 class ScriptExecutionContext;
 class SecurityOrigin;
 
-class AbstractDatabase : public ThreadSafeRefCounted<AbstractDatabase> {
+class DatabaseBackend : public ThreadSafeRefCounted<DatabaseBackend> {
 public:
-    virtual ~AbstractDatabase();
+    virtual ~DatabaseBackend();
 
     virtual String version() const;
 
@@ -101,8 +101,8 @@ protected:
         SyncDatabase
     };
 
-    AbstractDatabase(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion,
-                     const String& displayName, unsigned long estimatedSize, DatabaseType);
+    DatabaseBackend(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion,
+        const String& displayName, unsigned long estimatedSize, DatabaseType);
 
     void closeDatabase();
 
@@ -156,4 +156,4 @@ private:
 
 #endif // ENABLE(SQL_DATABASE)
 
-#endif // AbstractDatabase_h
+#endif // DatabaseBackend_h
index 3f5d558..e2c28c3 100644 (file)
@@ -28,8 +28,8 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
 #include "Database.h"
+#include "DatabaseBackend.h"
 #include "DatabaseCallback.h"
 #include "DatabaseContext.h"
 #include "DatabaseSync.h"
@@ -338,7 +338,7 @@ void DatabaseManager::scheduleNotifyDatabaseChanged(SecurityOrigin* origin, cons
     m_server->scheduleNotifyDatabaseChanged(origin, name);
 }
 
-void DatabaseManager::databaseChanged(AbstractDatabase* database)
+void DatabaseManager::databaseChanged(DatabaseBackend* database)
 {
     m_server->databaseChanged(database);
 }
@@ -362,12 +362,12 @@ bool DatabaseManager::canEstablishDatabase(ScriptExecutionContext* context, cons
     return m_server->canEstablishDatabase(context, name, displayName, estimatedSize);
 }
 
-void DatabaseManager::addOpenDatabase(AbstractDatabase* database)
+void DatabaseManager::addOpenDatabase(DatabaseBackend* database)
 {
     m_server->addOpenDatabase(database);
 }
 
-void DatabaseManager::removeOpenDatabase(AbstractDatabase* database)
+void DatabaseManager::removeOpenDatabase(DatabaseBackend* database)
 {
     m_server->removeOpenDatabase(database);
 }
@@ -377,7 +377,7 @@ void DatabaseManager::setDatabaseDetails(SecurityOrigin* origin, const String& n
     m_server->setDatabaseDetails(origin, name, displayName, estimatedSize);
 }
 
-unsigned long long DatabaseManager::getMaxSizeForDatabase(const AbstractDatabase* database)
+unsigned long long DatabaseManager::getMaxSizeForDatabase(const DatabaseBackend* database)
 {
     return m_server->getMaxSizeForDatabase(database);
 }
index 0e1d2b0..83470ba 100644 (file)
@@ -103,7 +103,7 @@ public:
     // From a secondary thread, must be thread safe with its data
     void scheduleNotifyDatabaseChanged(SecurityOrigin*, const String& name);
 
-    void databaseChanged(AbstractDatabase*);
+    void databaseChanged(DatabaseBackend*);
 
 #else // PLATFORM(CHROMIUM)
     void closeDatabasesImmediately(const String& originIdentifier, const String& name);
@@ -112,11 +112,11 @@ public:
     void interruptAllDatabasesForContext(ScriptExecutionContext*);
 
     bool canEstablishDatabase(ScriptExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize);
-    void addOpenDatabase(AbstractDatabase*);
-    void removeOpenDatabase(AbstractDatabase*);
+    void addOpenDatabase(DatabaseBackend*);
+    void removeOpenDatabase(DatabaseBackend*);
 
     void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize);
-    unsigned long long getMaxSizeForDatabase(const AbstractDatabase*);
+    unsigned long long getMaxSizeForDatabase(const DatabaseBackend*);
 
 private:
     DatabaseManager();
index bc135fe..fe13df9 100644 (file)
@@ -50,7 +50,7 @@ namespace WebCore {
 
 DatabaseSync::DatabaseSync(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion,
                            const String& displayName, unsigned long estimatedSize)
-    : AbstractDatabase(databaseContext, name, expectedVersion, displayName, estimatedSize, SyncDatabase)
+    : DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, SyncDatabase)
 {
 }
 
index 0e71759..9450bfd 100644 (file)
@@ -33,7 +33,7 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
+#include "DatabaseBackend.h"
 #include "DatabaseBasicTypes.h"
 #include <wtf/Forward.h>
 #include <wtf/text/WTFString.h>
@@ -50,7 +50,7 @@ class SQLTransactionSyncCallback;
 class SecurityOrigin;
 
 // Instances of this class should be created and used only on the worker's context thread.
-class DatabaseSync : public AbstractDatabase {
+class DatabaseSync : public DatabaseBackend {
 public:
     virtual ~DatabaseSync();
 
index 3a4a35a..11c59b7 100644 (file)
@@ -31,9 +31,9 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
 #include "Chrome.h"
 #include "ChromeClient.h"
+#include "DatabaseBackend.h"
 #include "DatabaseContext.h"
 #include "DatabaseManager.h"
 #include "DatabaseManagerClient.h"
@@ -213,7 +213,7 @@ bool DatabaseTracker::hasEntryForDatabase(SecurityOrigin* origin, const String&
     return statement.step() == SQLResultRow;
 }
 
-unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase* database)
+unsigned long long DatabaseTracker::getMaxSizeForDatabase(const DatabaseBackend* database)
 {
     // The maximum size for a database is the full quota for its origin, minus the current usage within the origin,
     // plus the current usage of the given database
@@ -223,7 +223,7 @@ unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase
     return quotaForOriginNoLock(origin) - originQuotaManager().diskUsage(origin) + SQLiteFileSystem::getDatabaseFileSize(database->fileName());
 }
 
-void DatabaseTracker::databaseChanged(AbstractDatabase* database)
+void DatabaseTracker::databaseChanged(DatabaseBackend* database)
 {
     Locker<OriginQuotaManager> quotaManagerLocker(originQuotaManager());
     originQuotaManager().markDatabase(database);
@@ -231,7 +231,7 @@ void DatabaseTracker::databaseChanged(AbstractDatabase* database)
 
 void DatabaseTracker::interruptAllDatabasesForContext(const ScriptExecutionContext* context)
 {
-    Vector<RefPtr<AbstractDatabase> > openDatabases;
+    Vector<RefPtr<DatabaseBackend> > openDatabases;
     {
         MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
 
@@ -253,8 +253,8 @@ void DatabaseTracker::interruptAllDatabasesForContext(const ScriptExecutionConte
         }
     }
 
-    Vector<RefPtr<AbstractDatabase> >::const_iterator openDatabasesEndIt = openDatabases.end();
-    for (Vector<RefPtr<AbstractDatabase> >::const_iterator openDatabasesIt = openDatabases.begin(); openDatabasesIt != openDatabasesEndIt; ++openDatabasesIt)
+    Vector<RefPtr<DatabaseBackend> >::const_iterator openDatabasesEndIt = openDatabases.end();
+    for (Vector<RefPtr<DatabaseBackend> >::const_iterator openDatabasesIt = openDatabases.begin(); openDatabasesIt != openDatabasesEndIt; ++openDatabasesIt)
         (*openDatabasesIt)->interrupt();
 }
 
@@ -492,7 +492,7 @@ unsigned long long DatabaseTracker::usageForDatabase(const String& name, Securit
     return SQLiteFileSystem::getDatabaseFileSize(path);
 }
 
-void DatabaseTracker::addOpenDatabase(AbstractDatabase* database)
+void DatabaseTracker::addOpenDatabase(DatabaseBackend* database)
 {
     if (!database)
         return;
@@ -531,7 +531,7 @@ void DatabaseTracker::addOpenDatabase(AbstractDatabase* database)
     doneCreatingDatabase(database->securityOrigin(), database->stringIdentifier());
 }
 
-void DatabaseTracker::removeOpenDatabase(AbstractDatabase* database)
+void DatabaseTracker::removeOpenDatabase(DatabaseBackend* database)
 {
     if (!database)
         return;
@@ -578,7 +578,7 @@ void DatabaseTracker::removeOpenDatabase(AbstractDatabase* database)
     }
 }
 
-void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases)
+void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<DatabaseBackend> >* databases)
 {
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
     if (!m_openDatabaseMap)
@@ -1000,7 +1000,7 @@ bool DatabaseTracker::deleteDatabaseFile(SecurityOrigin* origin, const String& n
     }
 #endif
 
-    Vector<RefPtr<AbstractDatabase> > deletedDatabases;
+    Vector<RefPtr<DatabaseBackend> > deletedDatabases;
 
     // Make sure not to hold the any locks when calling
     // Database::markAsDeletedAndClose(), since that can cause a deadlock
index 7d0d551..cf488ca 100644 (file)
@@ -44,7 +44,7 @@
 
 namespace WebCore {
 
-class AbstractDatabase;
+class DatabaseBackend;
 class ScriptExecutionContext;
 class SecurityOrigin;
 
@@ -74,12 +74,12 @@ public:
     void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize);
     String fullPathForDatabase(SecurityOrigin*, const String& name, bool createIfDoesNotExist = true);
 
-    void addOpenDatabase(AbstractDatabase*);
-    void removeOpenDatabase(AbstractDatabase*);
-    void getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases);
+    void addOpenDatabase(DatabaseBackend*);
+    void removeOpenDatabase(DatabaseBackend*);
+    void getOpenDatabases(SecurityOrigin*, const String& name, HashSet<RefPtr<DatabaseBackend> >* databases);
 
-    unsigned long long getMaxSizeForDatabase(const AbstractDatabase*);
-    void databaseChanged(AbstractDatabase*);
+    unsigned long long getMaxSizeForDatabase(const DatabaseBackend*);
+    void databaseChanged(DatabaseBackend*);
 
     void interruptAllDatabasesForContext(const ScriptExecutionContext*);
 
@@ -131,7 +131,7 @@ private:
 
     bool deleteDatabaseFile(SecurityOrigin*, const String& name);
 
-    typedef HashSet<AbstractDatabase*> DatabaseSet;
+    typedef HashSet<DatabaseBackend*> DatabaseSet;
     typedef HashMap<String, DatabaseSet*> DatabaseNameMap;
     typedef HashMap<RefPtr<SecurityOrigin>, DatabaseNameMap*, SecurityOriginHash> DatabaseOriginMap;
 
@@ -175,12 +175,12 @@ public:
     void closeDatabasesImmediately(const String& originIdentifier, const String& name);
 
 private:
-    typedef HashSet<AbstractDatabase*> DatabaseSet;
+    typedef HashSet<DatabaseBackend*> DatabaseSet;
     typedef HashMap<String, DatabaseSet*> DatabaseNameMap;
     typedef HashMap<String, DatabaseNameMap*> DatabaseOriginMap;
     class CloseOneDatabaseImmediatelyTask;
 
-    void closeOneDatabaseImmediately(const String& originIdentifier, const String& name, AbstractDatabase* database);
+    void closeOneDatabaseImmediately(const String& originIdentifier, const String& name, DatabaseBackend*);
 
     Mutex m_openDatabaseMapGuard;
     mutable OwnPtr<DatabaseOriginMap> m_openDatabaseMap;
index b6cbef1..39edacf 100644 (file)
@@ -30,7 +30,7 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
+#include "DatabaseBackend.h"
 #include "OriginUsageRecord.h"
 
 namespace WebCore {
@@ -112,7 +112,7 @@ void OriginQuotaManager::removeOrigin(SecurityOrigin* origin)
     }
 }
 
-void OriginQuotaManager::markDatabase(AbstractDatabase* database)
+void OriginQuotaManager::markDatabase(DatabaseBackend* database)
 {
     ASSERT(database);
     ASSERT(m_usageRecordGuardLocked);
index 974de72..db70420 100644 (file)
@@ -38,7 +38,7 @@
 
 namespace WebCore {
 
-class AbstractDatabase;
+class DatabaseBackend;
 class OriginUsageRecord;
 
 class OriginQuotaManager {
@@ -56,7 +56,7 @@ public:
     void removeDatabase(SecurityOrigin*, const String& databaseIdentifier);
     void removeOrigin(SecurityOrigin*);
 
-    void markDatabase(AbstractDatabase*); // Mark dirtiness of a specific database.
+    void markDatabase(DatabaseBackend*); // Mark dirtiness of a specific database.
     unsigned long long diskUsage(SecurityOrigin*) const;
 
 private:
index 084dcb3..1fafde7 100644 (file)
@@ -33,7 +33,7 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
+#include "DatabaseBackend.h"
 #include "DatabaseContext.h"
 #include "DatabaseManager.h"
 #include "ScriptExecutionContext.h"
 
 namespace WebCore {
 
-void SQLTransactionClient::didCommitWriteTransaction(AbstractDatabase* database)
+void SQLTransactionClient::didCommitWriteTransaction(DatabaseBackend* database)
 {
     DatabaseManager::manager().scheduleNotifyDatabaseChanged(
         database->securityOrigin(), database->stringIdentifier());
 }
 
-void SQLTransactionClient::didExecuteStatement(AbstractDatabase* database)
+void SQLTransactionClient::didExecuteStatement(DatabaseBackend* database)
 {
     DatabaseManager::manager().databaseChanged(database);
 }
 
-bool SQLTransactionClient::didExceedQuota(AbstractDatabase* database)
+bool SQLTransactionClient::didExceedQuota(DatabaseBackend* database)
 {
     ASSERT(database->scriptExecutionContext()->isContextThread());
     unsigned long long currentQuota = DatabaseManager::manager().quotaForOrigin(database->securityOrigin());
index 28559ed..8e038dd 100644 (file)
@@ -38,7 +38,7 @@
 
 namespace WebCore {
 
-class AbstractDatabase;
+class DatabaseBackend;
 
 // A client to the SQLTransaction class. Allows SQLTransaction to notify interested
 // parties that certain things have happened in a transaction.
@@ -46,9 +46,9 @@ class SQLTransactionClient {
     WTF_MAKE_NONCOPYABLE(SQLTransactionClient); WTF_MAKE_FAST_ALLOCATED;
 public:
     SQLTransactionClient() { }
-    void didCommitWriteTransaction(AbstractDatabase*);
-    void didExecuteStatement(AbstractDatabase*);
-    bool didExceedQuota(AbstractDatabase*);
+    void didCommitWriteTransaction(DatabaseBackend*);
+    void didExecuteStatement(DatabaseBackend*);
+    bool didExceedQuota(DatabaseBackend*);
 };
 
 }
index 657c78e..e1eeba8 100644 (file)
@@ -37,7 +37,7 @@
 
 namespace WebCore {
 
-class AbstractDatabase;
+class DatabaseBackend;
 class ScriptExecutionContext;
 
 // The implementation of this class is in the WebKit API (Chromium source tree)
@@ -45,16 +45,16 @@ class ScriptExecutionContext;
 class DatabaseObserver {
 public:
     static bool canEstablishDatabase(ScriptExecutionContext*, const String&, const String&, unsigned long);
-    static void databaseOpened(AbstractDatabase*);
-    static void databaseModified(AbstractDatabase*);
-    static void databaseClosed(AbstractDatabase*);
+    static void databaseOpened(DatabaseBackend*);
+    static void databaseModified(DatabaseBackend*);
+    static void databaseClosed(DatabaseBackend*);
 
-    static void reportOpenDatabaseResult(AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
-    static void reportChangeVersionResult(AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
-    static void reportStartTransactionResult(AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
-    static void reportCommitTransactionResult(AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
-    static void reportExecuteStatementResult(AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
-    static void reportVacuumDatabaseResult(AbstractDatabase*, int sqliteErrorCode);
+    static void reportOpenDatabaseResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
+    static void reportChangeVersionResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
+    static void reportStartTransactionResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
+    static void reportCommitTransactionResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
+    static void reportExecuteStatementResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode);
+    static void reportVacuumDatabaseResult(DatabaseBackend*, int sqliteErrorCode);
 };
 
 }
index 309d46c..1fa6265 100644 (file)
@@ -33,7 +33,7 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
+#include "DatabaseBackend.h"
 #include "DatabaseObserver.h"
 #include "QuotaTracker.h"
 #include "ScriptExecutionContext.h"
@@ -71,7 +71,7 @@ String DatabaseTracker::fullPathForDatabase(SecurityOrigin* origin, const String
     return origin->databaseIdentifier() + "/" + name + "#";
 }
 
-void DatabaseTracker::addOpenDatabase(AbstractDatabase* database)
+void DatabaseTracker::addOpenDatabase(DatabaseBackend* database)
 {
     ASSERT(database->scriptExecutionContext()->isContextThread());
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
@@ -99,7 +99,7 @@ void DatabaseTracker::addOpenDatabase(AbstractDatabase* database)
 
 class NotifyDatabaseObserverOnCloseTask : public ScriptExecutionContext::Task {
 public:
-    static PassOwnPtr<NotifyDatabaseObserverOnCloseTask> create(PassRefPtr<AbstractDatabase> database)
+    static PassOwnPtr<NotifyDatabaseObserverOnCloseTask> create(PassRefPtr<DatabaseBackend> database)
     {
         return adoptPtr(new NotifyDatabaseObserverOnCloseTask(database));
     }
@@ -115,15 +115,15 @@ public:
     }
 
 private:
-    NotifyDatabaseObserverOnCloseTask(PassRefPtr<AbstractDatabase> database)
+    NotifyDatabaseObserverOnCloseTask(PassRefPtr<DatabaseBackend> database)
         : m_database(database)
     {
     }
 
-    RefPtr<AbstractDatabase> m_database;
+    RefPtr<DatabaseBackend> m_database;
 };
 
-void DatabaseTracker::removeOpenDatabase(AbstractDatabase* database)
+void DatabaseTracker::removeOpenDatabase(DatabaseBackend* database)
 {
     String originIdentifier = database->securityOrigin()->databaseIdentifier();
     MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard);
@@ -157,7 +157,7 @@ void DatabaseTracker::removeOpenDatabase(AbstractDatabase* database)
         DatabaseObserver::databaseClosed(database);
 }
 
-unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase* database)
+unsigned long long DatabaseTracker::getMaxSizeForDatabase(const DatabaseBackend* database)
 {
     unsigned long long spaceAvailable = 0;
     unsigned long long databaseSize = 0;
@@ -191,7 +191,7 @@ void DatabaseTracker::interruptAllDatabasesForContext(const ScriptExecutionConte
 
 class DatabaseTracker::CloseOneDatabaseImmediatelyTask : public ScriptExecutionContext::Task {
 public:
-    static PassOwnPtr<CloseOneDatabaseImmediatelyTask> create(const String& originIdentifier, const String& name, AbstractDatabase* database)
+    static PassOwnPtr<CloseOneDatabaseImmediatelyTask> create(const String& originIdentifier, const String& name, DatabaseBackend* database)
     {
         return adoptPtr(new CloseOneDatabaseImmediatelyTask(originIdentifier, name, database));
     }
@@ -202,7 +202,7 @@ public:
     }
 
 private:
-    CloseOneDatabaseImmediatelyTask(const String& originIdentifier, const String& name, AbstractDatabase* database)
+    CloseOneDatabaseImmediatelyTask(const String& originIdentifier, const String& name, DatabaseBackend* database)
         : m_originIdentifier(originIdentifier.isolatedCopy())
         , m_name(name.isolatedCopy())
         , m_database(database)
@@ -211,7 +211,7 @@ private:
 
     String m_originIdentifier;
     String m_name;
-    AbstractDatabase* m_database;  // Intentionally a raw pointer.
+    DatabaseBackend* m_database; // Intentionally a raw pointer.
 };
 
 void DatabaseTracker::closeDatabasesImmediately(const String& originIdentifier, const String& name) {
@@ -234,7 +234,7 @@ void DatabaseTracker::closeDatabasesImmediately(const String& originIdentifier,
         (*it)->scriptExecutionContext()->postTask(CloseOneDatabaseImmediatelyTask::create(originIdentifier, name, *it));
 }
 
-void DatabaseTracker::closeOneDatabaseImmediately(const String& originIdentifier, const String& name, AbstractDatabase* database)
+void DatabaseTracker::closeOneDatabaseImmediately(const String& originIdentifier, const String& name, DatabaseBackend* database)
 {
     // First we have to confirm the 'database' is still in our collection.
     {
index d12f471..dc31e3c 100644 (file)
@@ -33,7 +33,7 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
+#include "DatabaseBackend.h"
 #include "DatabaseObserver.h"
 #include "ScriptExecutionContext.h"
 
@@ -41,7 +41,7 @@ namespace WebCore {
 
 class NotifyDatabaseChangedTask : public ScriptExecutionContext::Task {
 public:
-    static PassOwnPtr<NotifyDatabaseChangedTask> create(AbstractDatabase *database)
+    static PassOwnPtr<NotifyDatabaseChangedTask> create(DatabaseBackend *database)
     {
         return adoptPtr(new NotifyDatabaseChangedTask(database));
     }
@@ -52,15 +52,15 @@ public:
     }
 
 private:
-    NotifyDatabaseChangedTask(PassRefPtr<AbstractDatabase> database)
+    NotifyDatabaseChangedTask(PassRefPtr<DatabaseBackend> database)
         : m_database(database)
     {
     }
 
-    RefPtr<AbstractDatabase> m_database;
+    RefPtr<DatabaseBackend> m_database;
 };
 
-void SQLTransactionClient::didCommitWriteTransaction(AbstractDatabase* database)
+void SQLTransactionClient::didCommitWriteTransaction(DatabaseBackend* database)
 {
     if (!database->scriptExecutionContext()->isContextThread()) {
         database->scriptExecutionContext()->postTask(NotifyDatabaseChangedTask::create(database));
@@ -70,13 +70,13 @@ void SQLTransactionClient::didCommitWriteTransaction(AbstractDatabase* database)
     WebCore::DatabaseObserver::databaseModified(database);
 }
 
-void SQLTransactionClient::didExecuteStatement(AbstractDatabase* database)
+void SQLTransactionClient::didExecuteStatement(DatabaseBackend* database)
 {
     // This method is called after executing every statement that changes the DB.
     // Chromium doesn't need to do anything at that point.
 }
 
-bool SQLTransactionClient::didExceedQuota(AbstractDatabase* database)
+bool SQLTransactionClient::didExceedQuota(DatabaseBackend* database)
 {
     // Chromium does not allow users to manually change the quota for an origin (for now, at least).
     // Don't do anything.
index 505db5e..eceb8b6 100644 (file)
@@ -19,10 +19,10 @@ SOURCES += \
     Modules/geolocation/GeolocationController.cpp \
     Modules/geolocation/NavigatorGeolocation.cpp \
     \
-    Modules/webdatabase/AbstractDatabase.cpp \
     Modules/webdatabase/DOMWindowWebDatabase.cpp \
     Modules/webdatabase/Database.cpp \
     Modules/webdatabase/DatabaseAuthorizer.cpp \
+    Modules/webdatabase/DatabaseBackend.cpp \
     Modules/webdatabase/DatabaseContext.cpp \
     Modules/webdatabase/DatabaseSync.cpp \
     Modules/webdatabase/DBBackendServer.cpp \
@@ -1434,12 +1434,12 @@ HEADERS += \
     Modules/proximity/DeviceProximityController.h \
     Modules/proximity/DeviceProximityEvent.h \
     \
-    Modules/webdatabase/AbstractDatabase.h \
     Modules/webdatabase/AbstractDatabaseServer.h \
     Modules/webdatabase/ChangeVersionWrapper.h \
     Modules/webdatabase/DOMWindowWebDatabase.h \
     Modules/webdatabase/DatabaseAuthorizer.h \
     Modules/webdatabase/Database.h \
+    Modules/webdatabase/DatabaseBackend.h \
     Modules/webdatabase/DatabaseCallback.h \
     Modules/webdatabase/DatabaseManager.h \
     Modules/webdatabase/DatabaseSync.h \
index 74a833d..d7a37f6 100644 (file)
             'Modules/webaudio/WaveShaperProcessor.h',
             'Modules/webaudio/WaveTable.cpp',
             'Modules/webaudio/WaveTable.h',
-            'Modules/webdatabase/AbstractDatabase.cpp',
             'Modules/webdatabase/AbstractDatabaseServer.h',
             'Modules/webdatabase/ChangeVersionWrapper.cpp',
             'Modules/webdatabase/ChangeVersionWrapper.h',
             'Modules/webdatabase/Database.cpp',
             'Modules/webdatabase/DatabaseAuthorizer.cpp',
             'Modules/webdatabase/DatabaseAuthorizer.h',
+            'Modules/webdatabase/DatabaseBackend.cpp',
             'Modules/webdatabase/DatabaseCallback.h',
             'Modules/webdatabase/DatabaseContext.cpp',
             'Modules/webdatabase/DatabaseContext.h',
index 6d09b7a..af81e6e 100644 (file)
@@ -1440,7 +1440,7 @@ __ZN7WebCore8Settings20setJavaScriptEnabledEb
 __ZN7WebCore8Settings18setMinimumFontSizeEi
 __ZN7WebCore8Settings25setMinimumLogicalFontSizeEi
 __ZN7WebCore8Settings17setPluginsEnabledEb
-__ZN7WebCore16AbstractDatabase14setIsAvailableEb
+__ZN7WebCore15DatabaseBackend14setIsAvailableEb
 __ZN7WebCore8Settings25setPrivateBrowsingEnabledEb
 __ZN7WebCore8Settings22setSansSerifFontFamilyERKN3WTF12AtomicStringE
 __ZN7WebCore8Settings18setSerifFontFamilyERKN3WTF12AtomicStringE
@@ -25526,7 +25526,7 @@ __ZN7WebCore26jsHTMLIFrameElementSandboxEPN3JSC9ExecStateENS0_7JSValueERKNS0_10I
 __ZN7WebCore15HTMLTreeBuilder24defaultForInHeadNoscriptEv
 __ZN7WebCore40jsDOMWindowPrototypeFunctionOpenDatabaseEPN3JSC9ExecStateE
 __ZN7WebCore9DOMWindow12openDatabaseERKN3WTF6StringES4_S4_mNS1_10PassRefPtrINS_16DatabaseCallbackEEERi
-__ZN7WebCore16AbstractDatabase11isAvailableEv
+__ZN7WebCore15DatabaseBackend11isAvailableEv
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_8DatabaseE
 __ZN7WebCore8Database12openDatabaseEPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_mNS3_10PassRefPtrINS_16DatabaseCallbackEEERi
 __ZN7WebCore15DatabaseTracker20canEstablishDatabaseEPNS_22ScriptExecutionContextERKN3WTF6StringES6_m
@@ -25562,7 +25562,7 @@ __ZN7WebCore15DatabaseTracker8setQuotaEPNS_14SecurityOriginEy
 __ZNK3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_yENS_18PairFirstExtractorIS6_EENS2_18SecurityOriginHashENS_14PairHashTraitsINS_10HashTraitsIS4_EENSB_IyEEEESC_E8containsIPS3_NS_29RefPtrHashMapRawKeyTranslatorISH_S6_SE_S9_EEEEbRKT_
 __ZNK3WTF9HashTableIPSt4pairINS_6RefPtrIN7WebCore14SecurityOriginEEENS3_15DatabaseDetailsEES8_NS_17IdentityExtractorIS8_EENS_7PtrHashIS8_EENS_10HashTraitsIS8_EESE_E4findIS8_NS_22IdentityHashTranslatorIS8_S8_SC_EEEENS_22HashTableConstIteratorIS8_S8_SA_SC_SE_SE_EERKT_
 __ZN7WebCore8DatabaseC2EPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_m
-__ZN7WebCore16AbstractDatabaseC2EPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_m
+__ZN7WebCore15DatabaseBackendC2EPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_m
 __ZN7WebCore18DatabaseAuthorizer6createERKN3WTF6StringE
 __ZN7WebCore18DatabaseAuthorizer23addWhitelistedFunctionsEv
 __ZN3WTF9HashTableINS_6StringES1_NS_17IdentityExtractorIS1_EENS_15CaseFoldingHashENS_10HashTraitsIS1_EES6_E16lookupForWritingIS1_NS_22IdentityHashTranslatorIS1_S1_S4_EEEESt4pairIPS1_bERKT_
@@ -25570,9 +25570,9 @@ __ZN3WTF9HashTableINS_6StringESt4pairIS1_iENS_18PairFirstExtractorIS3_EENS_10Str
 __ZN3WTF9HashTableINS_6StringESt4pairIS1_iENS_18PairFirstExtractorIS3_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENS8_IiEEEES9_E3addIS1_iNS_17HashMapTranslatorIS3_SB_S6_EEEES2_INS_17HashTableIteratorIS1_S3_S5_S6_SB_S9_EEbERKT_RKT0_
 __ZN3WTF9HashTableINS_6StringESt4pairIS1_iENS_18PairFirstExtractorIS3_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENS8_IiEEEES9_E6lookupIS1_NS_22IdentityHashTranslatorIS1_S3_S6_EEEEPS3_RKT_
 __ZN3WTF9HashTableINS_6StringESt4pairIS1_iENS_18PairFirstExtractorIS3_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENS8_IiEEEES9_E6rehashEi
-__ZNK3WTF7HashMapIiPNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS4_EENS_10HashTraitsIS4_EEEENS_7IntHashIjEENS7_IiEENS7_ISA_EEE3getERKi
-__ZN3WTF9HashTableIPN7WebCore16AbstractDatabaseES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E3addIS3_S3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEESt4pairINS_17HashTableIteratorIS3_S3_S5_S7_S9_S9_EEbERKT_RKT0_
-__ZN3WTF9HashTableIPN7WebCore16AbstractDatabaseES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6expandEv
+__ZNK3WTF7HashMapIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS4_EENS_10HashTraitsIS4_EEEENS_7IntHashIjEENS7_IiEENS7_ISA_EEE3getERKi
+__ZN3WTF9HashTableIPN7WebCore15DatabaseBackendES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E3addIS3_S3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEESt4pairINS_17HashTableIteratorIS3_S3_S5_S7_S9_S9_EEbERKT_RKT0_
+__ZN3WTF9HashTableIPN7WebCore15DatabaseBackendES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6expandEv
 __ZN7WebCore15DatabaseTracker19fullPathForDatabaseEPNS_14SecurityOriginERKN3WTF6StringEb
 __ZN7WebCore15DatabaseTracker25fullPathForDatabaseNoLockEPNS_14SecurityOriginERKN3WTF6StringEb
 __ZNK7WebCore15DatabaseTracker10originPathEPNS_14SecurityOriginE
@@ -25583,16 +25583,16 @@ __ZN7WebCore18OriginQuotaManager11addDatabaseEPNS_14SecurityOriginERKN3WTF6Strin
 __ZN7WebCore17OriginUsageRecord11addDatabaseERKN3WTF6StringES4_
 __ZN3WTF7HashMapINS_6StringEN7WebCore17OriginUsageRecord13DatabaseEntryENS_10StringHashENS_10HashTraitsIS1_EENS6_IS4_EEE3setERKS1_RKS4_
 __ZN3WTF17HashMapTranslatorISt4pairINS_6StringEN7WebCore17OriginUsageRecord13DatabaseEntryEENS_14PairHashTraitsINS_10HashTraitsIS2_EENS8_IS5_EEEENS_10StringHashEE9translateERS6_RKS2_RKS5_
-__ZN7WebCore15DatabaseTracker15addOpenDatabaseEPNS_16AbstractDatabaseE
-__ZN3WTF10PassOwnPtrINS_7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEEPNS1_INS_6StringEPNS_7HashSetIPNS3_16AbstractDatabaseENS_7PtrHashIS9_EENS_10HashTraitsIS9_EEEENS_10StringHashENSC_IS6_EENSC_ISF_EEEENS3_18SecurityOriginHashENSC_IS5_EENSC_ISK_EEEEED1Ev
-__ZNK7WebCore16AbstractDatabase16stringIdentifierEv
-__ZNK7WebCore16AbstractDatabase14securityOriginEv
-__ZNK3WTF7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEEPNS0_INS_6StringEPNS_7HashSetIPNS2_16AbstractDatabaseENS_7PtrHashIS8_EENS_10HashTraitsIS8_EEEENS_10StringHashENSB_IS5_EENSB_ISE_EEEENS2_18SecurityOriginHashENSB_IS4_EENSB_ISJ_EEE3getEPS3_
-__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E16lookupForWritingIS1_NS_22IdentityHashTranslatorIS1_SD_SG_EEEES2_IPSD_bERKT_
-__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E3addIS1_SC_NS_17HashMapTranslatorISD_SK_SG_EEEES2_INS_17HashTableIteratorIS1_SD_SF_SG_SK_SI_EEbERKT_RKT0_
-__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6lookupIS1_NS_22IdentityHashTranslatorIS1_SD_SG_EEEEPSD_RKT_
-__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6rehashEi
-__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6removeEPSD_
+__ZN7WebCore15DatabaseTracker15addOpenDatabaseEPNS_15DatabaseBackendE
+__ZN3WTF10PassOwnPtrINS_7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEEPNS1_INS_6StringEPNS_7HashSetIPNS3_15DatabaseBackendENS_7PtrHashIS9_EENS_10HashTraitsIS9_EEEENS_10StringHashENSC_IS6_EENSC_ISF_EEEENS3_18SecurityOriginHashENSC_IS5_EENSC_ISK_EEEEED1Ev
+__ZNK7WebCore15DatabaseBackend16stringIdentifierEv
+__ZNK7WebCore15DatabaseBackend14securityOriginEv
+__ZNK3WTF7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEEPNS0_INS_6StringEPNS_7HashSetIPNS2_15DatabaseBackendENS_7PtrHashIS8_EENS_10HashTraitsIS8_EEEENS_10StringHashENSB_IS5_EENSB_ISE_EEEENS2_18SecurityOriginHashENSB_IS4_EENSB_ISJ_EEE3getEPS3_
+__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E16lookupForWritingIS1_NS_22IdentityHashTranslatorIS1_SD_SG_EEEES2_IPSD_bERKT_
+__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E3addIS1_SC_NS_17HashMapTranslatorISD_SK_SG_EEEES2_INS_17HashTableIteratorIS1_SD_SF_SG_SK_SI_EEbERKT_RKT0_
+__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6lookupIS1_NS_22IdentityHashTranslatorIS1_SD_SG_EEEEPSD_RKT_
+__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6rehashEi
+__ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6removeEPSD_
 __ZN7WebCore15DatabaseTracker20doneCreatingDatabaseEPNS_14SecurityOriginERKN3WTF6StringE
 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringElNS_10StringHashENS_10HashTraitsIS7_EENS9_IlEEEEENS_18PairFirstExtractorISE_EENS2_18SecurityOriginHashENS_14PairHashTraitsINS9_IS4_EENS9_ISD_EEEESJ_E16lookupForWritingERKS4_
 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringElNS_10StringHashENS_10HashTraitsIS7_EENS9_IlEEEEENS_18PairFirstExtractorISE_EENS2_18SecurityOriginHashENS_14PairHashTraitsINS9_IS4_EENS9_ISD_EEEESJ_E3addIS4_SD_NS_17HashMapTranslatorISE_SL_SH_EEEES5_INS_17HashTableIteratorIS4_SE_SG_SH_SL_SJ_EEbERKT_RKT0_
@@ -25615,11 +25615,11 @@ __ZN3WTF5DequeIPN7WebCore12DatabaseTaskELm0EE14expandCapacityEv
 __ZN3WTF12MessageQueueIN7WebCore12DatabaseTaskEE14waitForMessageEv
 __ZN3WTF12MessageQueueIN7WebCore12DatabaseTaskEE19alwaysTruePredicateEPS2_
 __ZN7WebCore12DatabaseTask11performTaskEv
-__ZN7WebCore16AbstractDatabase15resetAuthorizerEv
+__ZN7WebCore15DatabaseBackend15resetAuthorizerEv
 __ZN7WebCore18DatabaseAuthorizer5resetEv
 __ZN7WebCore8Database16DatabaseOpenTask13doPerformTaskEv
 __ZN7WebCore8Database20performOpenAndVerifyEbRi
-__ZN7WebCore16AbstractDatabase20performOpenAndVerifyEbRi
+__ZN7WebCore15DatabaseBackend20performOpenAndVerifyEbRi
 __ZN7WebCore14SQLiteDatabase27turnOnIncrementalAutoVacuumEv
 __ZN7WebCore14SQLiteDatabase13setAuthorizerEN3WTF10PassRefPtrINS_18DatabaseAuthorizerEEE
 __ZN7WebCore14SQLiteDatabase14setBusyTimeoutEi
@@ -25634,10 +25634,10 @@ __ZN7WebCore18DatabaseAuthorizer11allowInsertERKN3WTF6StringE
 __ZN7WebCore18DatabaseAuthorizer11createTableERKN3WTF6StringE
 __ZN7WebCore18DatabaseAuthorizer11createIndexERKN3WTF6StringES4_
 __ZN7WebCore18DatabaseAuthorizer11allowUpdateERKN3WTF6StringES4_
-__ZN7WebCore16AbstractDatabase22getVersionFromDatabaseERN3WTF6StringE
+__ZN7WebCore15DatabaseBackend22getVersionFromDatabaseERN3WTF6StringE
 __ZN7WebCore18DatabaseAuthorizer7disableEv
 __ZN7WebCore18DatabaseAuthorizer6enableEv
-__ZN7WebCore16AbstractDatabase20setVersionInDatabaseERKN3WTF6StringE
+__ZN7WebCore15DatabaseBackend20setVersionInDatabaseERKN3WTF6StringE
 __ZN7WebCoreL20updateGuidVersionMapEiN3WTF6StringE
 __ZN7WebCore14DatabaseThread18recordDatabaseOpenEPNS_8DatabaseE
 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore8DatabaseEEES4_NS_17IdentityExtractorIS4_EENS_7PtrHashIS4_EENS_10HashTraitsIS4_EESA_E3addIS4_S4_NS_22IdentityHashTranslatorIS4_S4_S8_EEEESt4pairINS_17HashTableIteratorIS4_S4_S6_S8_SA_SA_EEbERKT_RKT0_
@@ -25648,7 +25648,7 @@ __ZN7WebCore15DatabaseTracker18setDatabaseDetailsEPNS_14SecurityOriginERKN3WTF6S
 __ZN7WebCore24InspectorInstrumentation15didOpenDatabaseEPNS_22ScriptExecutionContextEN3WTF10PassRefPtrINS_8DatabaseEEERKNS3_6StringES9_S9_
 __ZN7WebCore24InspectorInstrumentation19didOpenDatabaseImplEPNS_19InstrumentingAgentsEN3WTF10PassRefPtrINS_8DatabaseEEERKNS3_6StringES9_S9_
 __ZN7WebCore22InspectorDatabaseAgent15didOpenDatabaseEN3WTF10PassRefPtrINS_8DatabaseEEERKNS1_6StringES7_S7_
-__ZNK7WebCore16AbstractDatabase8fileNameEv
+__ZNK7WebCore15DatabaseBackend8fileNameEv
 __ZN7WebCore22InspectorDatabaseAgent14findByFileNameERKN3WTF6StringE
 __ZN7WebCore25InspectorDatabaseResource6createEN3WTF10PassRefPtrINS_8DatabaseEEERKNS1_6StringES7_S7_
 __ZN3WTF7HashMapIiNS_6RefPtrIN7WebCore25InspectorDatabaseResourceEEENS_7IntHashIjEENS_10HashTraitsIiEENS7_IS4_EEE3setERKiRKS4_
@@ -25665,26 +25665,26 @@ __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore25SQLTransactionCoordinator16C
 __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore25SQLTransactionCoordinator16CoordinationInfoEENS_18PairFirstExtractorIS6_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENSB_IS5_EEEESC_E6lookupIS1_NS_22IdentityHashTranslatorIS1_S6_S9_EEEEPS6_RKT_
 __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore25SQLTransactionCoordinator16CoordinationInfoEENS_18PairFirstExtractorIS6_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENSB_IS5_EEEESC_E6rehashEi
 __ZN7WebCore8Database5closeEv
-__ZN7WebCore16AbstractDatabase13closeDatabaseEv
-__ZNK3WTF9HashTableIPN7WebCore16AbstractDatabaseES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E4findIS3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEENS_22HashTableConstIteratorIS3_S3_S5_S7_S9_S9_EERKT_
-__ZN3WTF9HashTableIPN7WebCore16AbstractDatabaseES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6removeEPS3_
-__ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E16lookupForWritingERKi
-__ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E3addIiSB_NS_17HashMapTranslatorISC_SK_SG_EEEES1_INS_17HashTableIteratorIiSC_SE_SG_SK_SI_EEbERKT_RKT0_
-__ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E4findIiNS_22IdentityHashTranslatorIiSC_SG_EEEENS_17HashTableIteratorIiSC_SE_SG_SK_SI_EERKT_
-__ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore16AbstractDatabaseENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E6rehashEi
+__ZN7WebCore15DatabaseBackend13closeDatabaseEv
+__ZNK3WTF9HashTableIPN7WebCore15DatabaseBackendES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E4findIS3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEENS_22HashTableConstIteratorIS3_S3_S5_S7_S9_S9_EERKT_
+__ZN3WTF9HashTableIPN7WebCore15DatabaseBackendES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6removeEPS3_
+__ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E16lookupForWritingERKi
+__ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E3addIiSB_NS_17HashMapTranslatorISC_SK_SG_EEEES1_INS_17HashTableIteratorIiSC_SE_SG_SK_SI_EEbERKT_RKT0_
+__ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E4findIiNS_22IdentityHashTranslatorIiSC_SG_EEEENS_17HashTableIteratorIiSC_SE_SG_SK_SI_EERKT_
+__ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E6rehashEi
 __ZN7WebCore14DatabaseThread20recordDatabaseClosedEPNS_8DatabaseE
 __ZNK3WTF9HashTableINS_6RefPtrIN7WebCore8DatabaseEEES4_NS_17IdentityExtractorIS4_EENS_7PtrHashIS4_EENS_10HashTraitsIS4_EESA_E4findIS4_NS_22IdentityHashTranslatorIS4_S4_S8_EEEENS_22HashTableConstIteratorIS4_S4_S6_S8_SA_SA_EERKT_
 __ZN7WebCore14DatabaseThread23unscheduleDatabaseTasksEPNS_8DatabaseE
 __ZN3WTF12MessageQueueIN7WebCore12DatabaseTaskEE8removeIfINS1_21SameDatabasePredicateEEEvRT_
-__ZN7WebCore15DatabaseTracker18removeOpenDatabaseEPNS_16AbstractDatabaseE
+__ZN7WebCore15DatabaseTracker18removeOpenDatabaseEPNS_15DatabaseBackendE
 __ZNK7WebCore8Database14securityOriginEv
 __ZThn208_NK7WebCore8Document15isContextThreadEv
-__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_16AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E16lookupForWritingERKS4_
-__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_16AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E3addIS4_SL_NS_17HashMapTranslatorISM_ST_SP_EEEES5_INS_17HashTableIteratorIS4_SM_SO_SP_ST_SR_EEbERKT_RKT0_
-__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_16AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E4findIPS3_NS_29RefPtrHashMapRawKeyTranslatorISW_SM_ST_SP_EEEENS_17HashTableIteratorIS4_SM_SO_SP_ST_SR_EERKT_
-__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_16AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E4findIS4_NS_22IdentityHashTranslatorIS4_SM_SP_EEEENS_17HashTableIteratorIS4_SM_SO_SP_ST_SR_EERKT_
-__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_16AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E6rehashEi
-__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_16AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E6removeEPSM_
+__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_15DatabaseBackendENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E16lookupForWritingERKS4_
+__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_15DatabaseBackendENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E3addIS4_SL_NS_17HashMapTranslatorISM_ST_SP_EEEES5_INS_17HashTableIteratorIS4_SM_SO_SP_ST_SR_EEbERKT_RKT0_
+__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_15DatabaseBackendENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E4findIPS3_NS_29RefPtrHashMapRawKeyTranslatorISW_SM_ST_SP_EEEENS_17HashTableIteratorIS4_SM_SO_SP_ST_SR_EERKT_
+__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_15DatabaseBackendENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E4findIS4_NS_22IdentityHashTranslatorIS4_SM_SP_EEEENS_17HashTableIteratorIS4_SM_SO_SP_ST_SR_EERKT_
+__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_15DatabaseBackendENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E6rehashEi
+__ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_15DatabaseBackendENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E6removeEPSM_
 __ZN7WebCore18OriginQuotaManager12removeOriginEPNS_14SecurityOriginE
 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS2_17OriginUsageRecordEENS_18PairFirstExtractorIS8_EENS2_18SecurityOriginHashENS_14PairHashTraitsINS_10HashTraitsIS4_EENSD_IS7_EEEESE_E16lookupForWritingERKS4_
 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS2_17OriginUsageRecordEENS_18PairFirstExtractorIS8_EENS2_18SecurityOriginHashENS_14PairHashTraitsINS_10HashTraitsIS4_EENSD_IS7_EEEESE_E3addIS4_S7_NS_17HashMapTranslatorIS8_SG_SB_EEEES5_INS_17HashTableIteratorIS4_S8_SA_SB_SG_SE_EEbERKT_RKT0_
@@ -25697,7 +25697,7 @@ __ZNSt4pairIN3WTF6StringEN7WebCore17OriginUsageRecord13DatabaseEntryEED1Ev
 __ZN7WebCore25InspectorDatabaseResourceD1Ev
 __ZN7WebCore8DatabaseD0Ev
 __ZN3WTF5DequeINS_6RefPtrIN7WebCore14SQLTransactionEEELm0EE10destroyAllEv
-__ZN7WebCore16AbstractDatabaseD2Ev
+__ZN7WebCore15DatabaseBackendD2Ev
 __ZN7WebCore14SQLiteDatabaseD1Ev
 __ZN7WebCore18DatabaseAuthorizerD1Ev
 __ZN7WebCore19JSDatabasePrototypeD1Ev
@@ -25882,7 +25882,7 @@ __ZN7WebCore8Database11transactionEN3WTF10PassRefPtrINS_22SQLTransactionCallback
 __ZN7WebCore8Database14runTransactionEN3WTF10PassRefPtrINS_22SQLTransactionCallbackEEENS2_INS_27SQLTransactionErrorCallbackEEENS2_INS_12VoidCallbackEEEb
 __ZN7WebCore14SQLTransaction6createEPNS_8DatabaseEN3WTF10PassRefPtrINS_22SQLTransactionCallbackEEENS4_INS_27SQLTransactionErrorCallbackEEENS4_INS_12VoidCallbackEEENS4_INS_21SQLTransactionWrapperEEEb
 __ZN7WebCore14SQLTransactionC2EPNS_8DatabaseEN3WTF10PassRefPtrINS_22SQLTransactionCallbackEEENS4_INS_27SQLTransactionErrorCallbackEEENS4_INS_12VoidCallbackEEENS4_INS_21SQLTransactionWrapperEEEb
-__ZNK7WebCore16AbstractDatabase22scriptExecutionContextEv
+__ZNK7WebCore15DatabaseBackend22scriptExecutionContextEv
 __ZN3WTF5DequeINS_6RefPtrIN7WebCore14SQLTransactionEEELm0EE14expandCapacityEv
 __ZN7WebCore8Database19scheduleTransactionEv
 __ZN7WebCore8Database23DatabaseTransactionTaskC1EN3WTF10PassRefPtrINS_14SQLTransactionEEE
@@ -25890,7 +25890,7 @@ __ZN7WebCore14DatabaseThread12scheduleTaskEN3WTF10PassOwnPtrINS_12DatabaseTaskEE
 __ZN7WebCore8Database23DatabaseTransactionTask13doPerformTaskEv
 __ZN7WebCore14SQLTransaction15performNextStepEv
 __ZN7WebCore14SQLTransaction41checkAndHandleClosedOrInterruptedDatabaseEv
-__ZN7WebCore16AbstractDatabase13isInterruptedEv
+__ZN7WebCore15DatabaseBackend13isInterruptedEv
 __ZN7WebCore14SQLTransaction11acquireLockEv
 __ZNK7WebCore8Database22transactionCoordinatorEv
 __ZN7WebCore25SQLTransactionCoordinator11acquireLockEPNS_14SQLTransactionE
@@ -25904,7 +25904,7 @@ __ZN7WebCore8Database23scheduleTransactionStepEPNS_14SQLTransactionEb
 __ZN7WebCore8Database23DatabaseTransactionTaskD0Ev
 __ZN7WebCore14SQLTransaction27openTransactionAndPreflightEv
 __ZNK7WebCore8Database11maximumSizeEv
-__ZN7WebCore15DatabaseTracker21getMaxSizeForDatabaseEPKNS_16AbstractDatabaseE
+__ZN7WebCore15DatabaseTracker21getMaxSizeForDatabaseEPKNS_15DatabaseBackendE
 __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore17OriginUsageRecord13DatabaseEntryEENS_18PairFirstExtractorIS6_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENSB_IS5_EEEESC_E16lookupForWritingIS1_NS_22IdentityHashTranslatorIS1_S6_S9_EEEES2_IPS6_bERKT_
 __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore17OriginUsageRecord13DatabaseEntryEENS_18PairFirstExtractorIS6_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENSB_IS5_EEEESC_E3addIS1_S5_NS_17HashMapTranslatorIS6_SE_S9_EEEES2_INS_17HashTableIteratorIS1_S6_S8_S9_SE_SC_EEbERKT_RKT0_
 __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore17OriginUsageRecord13DatabaseEntryEENS_18PairFirstExtractorIS6_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENSB_IS5_EEEESC_E6lookupIS1_NS_22IdentityHashTranslatorIS1_S6_S9_EEEEPS6_RKT_
@@ -25912,11 +25912,11 @@ __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore17OriginUsageRecord13DatabaseE
 __ZN7WebCore16SQLiteFileSystem19getDatabaseFileSizeERKN3WTF6StringE
 __ZN7WebCore14SQLiteDatabase14setMaximumSizeEx
 __ZN7WebCore14SQLiteDatabase8pageSizeEv
-__ZN7WebCore16AbstractDatabase12resetDeletesEv
+__ZN7WebCore15DatabaseBackend12resetDeletesEv
 __ZN7WebCore18DatabaseAuthorizer12resetDeletesEv
-__ZN7WebCore16AbstractDatabase17disableAuthorizerEv
+__ZN7WebCore15DatabaseBackend17disableAuthorizerEv
 __ZN7WebCore18DatabaseAuthorizer16allowTransactionEv
-__ZN7WebCore16AbstractDatabase16enableAuthorizerEv
+__ZN7WebCore15DatabaseBackend16enableAuthorizerEv
 __ZN7WebCore8Database27scheduleTransactionCallbackEPNS_14SQLTransactionE
 __ZN7WebCore26DeliverPendingCallbackTask11performTaskEPNS_22ScriptExecutionContextE
 __ZN7WebCore14SQLTransaction22performPendingCallbackEv
@@ -25949,7 +25949,7 @@ __ZThn208_NK7WebCore8Document19allowDatabaseAccessEv
 __ZN7WebCore12SQLStatement6createEPNS_8DatabaseERKN3WTF6StringERKNS3_6VectorINS_8SQLValueELm0EEENS3_10PassRefPtrINS_20SQLStatementCallbackEEENSC_INS_25SQLStatementErrorCallbackEEEi
 __ZN7WebCore12SQLStatementC2EPNS_8DatabaseERKN3WTF6StringERKNS3_6VectorINS_8SQLValueELm0EEENS3_10PassRefPtrINS_20SQLStatementCallbackEEENSC_INS_25SQLStatementErrorCallbackEEEi
 __ZN3WTF6VectorIN7WebCore8SQLValueELm0EEC2ERKS3_
-__ZNK7WebCore16AbstractDatabase22versionMatchesExpectedEv
+__ZNK7WebCore15DatabaseBackend22versionMatchesExpectedEv
 __ZNK3WTF7HashMapIiNS_6StringENS_7IntHashIjEENS_10HashTraitsIiEENS4_IS1_EEE3getERKi
 __ZN7WebCore14SQLTransaction16enqueueStatementEN3WTF10PassRefPtrINS_12SQLStatementEEE
 __ZN3WTF5DequeINS_6RefPtrIN7WebCore12SQLStatementEEELm0EE14expandCapacityEv
@@ -25958,7 +25958,7 @@ __ZN7WebCore14SQLTransaction16getNextStatementEv
 __ZN7WebCore14SQLTransaction19runCurrentStatementEv
 __ZN7WebCore12SQLStatement7executeEPNS_8DatabaseE
 __ZN7WebCore12SQLStatement22clearFailureDueToQuotaEv
-__ZN7WebCore16AbstractDatabase24setAuthorizerPermissionsEi
+__ZN7WebCore15DatabaseBackend24setAuthorizerPermissionsEi
 __ZN7WebCore18DatabaseAuthorizer14setPermissionsEi
 __ZN7WebCore14SQLiteDatabase12lastErrorMsgEv
 __ZNK7WebCore12SQLStatement29lastExecutionFailedDueToQuotaEv
@@ -26512,14 +26512,14 @@ __ZN7WebCore14JSDatabaseSync15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalOb
 __ZN7WebCore14JSDatabaseSync18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
 __ZN3JSC18getStaticValueSlotIN7WebCore14JSDatabaseSyncENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE
 __ZN7WebCore21jsDatabaseSyncVersionEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
-__ZNK7WebCore16AbstractDatabase7versionEv
+__ZNK7WebCore15DatabaseBackend7versionEv
 __ZN7WebCore23JSDatabaseSyncPrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
 __ZN7WebCore44jsDatabaseSyncPrototypeFunctionChangeVersionEPN3JSC9ExecStateE
 __ZN7WebCore28JSSQLTransactionSyncCallbackC1EPN3JSC8JSObjectEPNS_17JSDOMGlobalObjectE
 __ZN7WebCore12DatabaseSync13changeVersionERKN3WTF6StringES4_NS1_10PassRefPtrINS_26SQLTransactionSyncCallbackEEERi
 __ZN7WebCore18SQLTransactionSync6createEPNS_12DatabaseSyncEN3WTF10PassRefPtrINS_26SQLTransactionSyncCallbackEEEb
 __ZN7WebCore18SQLTransactionSync5beginEv
-__ZNK7WebCore16AbstractDatabase11maximumSizeEv
+__ZNK7WebCore15DatabaseBackend11maximumSizeEv
 __ZN7WebCore18SQLTransactionSync7executeEv
 __ZN7WebCore28JSSQLTransactionSyncCallback11handleEventEPNS_18SQLTransactionSyncE
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_18SQLTransactionSyncE
@@ -26527,8 +26527,8 @@ __ZN7WebCore13createWrapperINS_20JSSQLTransactionSyncENS_18SQLTransactionSyncEEE
 __ZN7WebCore15getDOMStructureINS_20JSSQLTransactionSyncEEEPN3JSC9StructureEPNS2_9ExecStateEPNS_17JSDOMGlobalObjectE
 __ZN7WebCore20JSSQLTransactionSync15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
 __ZN7WebCore18SQLTransactionSync6commitEv
-__ZN7WebCore16AbstractDatabase10hadDeletesEv
-__ZN7WebCore16AbstractDatabase18setExpectedVersionERKN3WTF6StringE
+__ZN7WebCore15DatabaseBackend10hadDeletesEv
+__ZN7WebCore15DatabaseBackend18setExpectedVersionERKN3WTF6StringE
 __ZN7WebCore28JSSQLTransactionSyncCallbackD0Ev
 __ZNK7WebCore13WorkerContext15isContextThreadEv
 __ZN7WebCore42jsDatabaseSyncPrototypeFunctionTransactionEPN3JSC9ExecStateE
@@ -26543,27 +26543,27 @@ __ZN7WebCore16SQLStatementSyncC1ERKN3WTF6StringERKNS1_6VectorINS_8SQLValueELm0EE
 __ZN7WebCore16SQLStatementSync7executeEPNS_12DatabaseSyncERi
 __ZNK7WebCore15SQLiteStatement18bindParameterCountEv
 __ZN7WebCore12SQLResultSetC1Ev
-__ZN7WebCore16AbstractDatabase19lastActionWasInsertEv
+__ZN7WebCore15DatabaseBackend19lastActionWasInsertEv
 __ZN7WebCore12SQLResultSet11setInsertIdEx
 __ZN7WebCore14SQLiteDatabase11lastChangesEv
 __ZN7WebCore12SQLResultSet15setRowsAffectedEi
-__ZN7WebCore16AbstractDatabase25lastActionChangedDatabaseEv
-__ZN7WebCore20SQLTransactionClient19didExecuteStatementEPNS_16AbstractDatabaseE
-__ZN7WebCore15DatabaseTracker15databaseChangedEPNS_16AbstractDatabaseE
-__ZN7WebCore18OriginQuotaManager12markDatabaseEPNS_16AbstractDatabaseE
+__ZN7WebCore15DatabaseBackend25lastActionChangedDatabaseEv
+__ZN7WebCore20SQLTransactionClient19didExecuteStatementEPNS_15DatabaseBackendE
+__ZN7WebCore15DatabaseTracker15databaseChangedEPNS_15DatabaseBackendE
+__ZN7WebCore18OriginQuotaManager12markDatabaseEPNS_15DatabaseBackendE
 __ZN7WebCore17OriginUsageRecord12markDatabaseERKN3WTF6StringE
 __ZN7WebCore16SQLStatementSyncD1Ev
 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_12SQLResultSetE
 __ZN7WebCore13createWrapperINS_14JSSQLResultSetENS_12SQLResultSetEEEPNS_12JSDOMWrapperEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPT0_
 __ZN7WebCore15getDOMStructureINS_14JSSQLResultSetEEEPN3JSC9StructureEPNS2_9ExecStateEPNS_17JSDOMGlobalObjectE
 __ZN7WebCore14JSSQLResultSet15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE
-__ZN7WebCore20SQLTransactionClient25didCommitWriteTransactionEPNS_16AbstractDatabaseE
+__ZN7WebCore20SQLTransactionClient25didCommitWriteTransactionEPNS_15DatabaseBackendE
 __ZN7WebCore15DatabaseTracker29scheduleNotifyDatabaseChangedEPNS_14SecurityOriginERKN3WTF6StringE
 __ZN3WTF6VectorISt4pairINS_6RefPtrIN7WebCore14SecurityOriginEEENS_6StringEELm0EE14expandCapacityEm
 __ZNSt4pairIN3WTF6RefPtrIN7WebCore14SecurityOriginEEENS0_6StringEED1Ev
 __ZN7WebCore15DatabaseTracker22notifyDatabasesChangedEPv
-__ZN3WTF6VectorINS_6RefPtrIN7WebCore16AbstractDatabaseEEELm0EE14expandCapacityEm
-__ZN7WebCore16AbstractDatabase9interruptEv
+__ZN3WTF6VectorINS_6RefPtrIN7WebCore15DatabaseBackendEEELm0EE14expandCapacityEm
+__ZN7WebCore15DatabaseBackend9interruptEv
 __ZN7WebCore14SQLiteDatabase9interruptEv
 __ZN7WebCore14JSDatabaseSyncD1Ev
 __ZN7WebCore20JSSQLTransactionSyncD1Ev
@@ -26708,7 +26708,7 @@ __ZN7WebCore18DatabaseAuthorizer15dropTempTriggerERKN3WTF6StringES4_
 __ZN7WebCore18DatabaseAuthorizer12dropTempViewERKN3WTF6StringE
 __ZN7WebCore18DatabaseAuthorizer11dropTriggerERKN3WTF6StringES4_
 __ZN7WebCore18DatabaseAuthorizer8dropViewERKN3WTF6StringE
-__ZN7WebCore16AbstractDatabase25incrementalVacuumIfNeededEv
+__ZN7WebCore15DatabaseBackend25incrementalVacuumIfNeededEv
 __ZN7WebCore14SQLiteDatabase13freeSpaceSizeEv
 __ZN7WebCore14SQLiteDatabase9totalSizeEv
 __ZN7WebCore14SQLiteDatabase27runIncrementalVacuumCommandEv
@@ -28595,7 +28595,7 @@ __ZN7WebCore27ActiveDOMObjectCallbackImpl6resumeEv
 __ZN7WebCore28DatabaseCreationCallbackTaskD0Ev
 __ZN7WebCore12SQLStatement20setFailureDueToQuotaEv
 __ZN7WebCore14SQLTransaction28deliverQuotaIncreaseCallbackEv
-__ZN7WebCore20SQLTransactionClient14didExceedQuotaEPNS_16AbstractDatabaseE
+__ZN7WebCore20SQLTransactionClient14didExceedQuotaEPNS_15DatabaseBackendE
 __ZN7WebCore15DatabaseTracker14quotaForOriginEPNS_14SecurityOriginE
 __ZN7WebCore14jsSQLErrorCodeEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE
 __ZN7WebCore19JSSQLErrorPrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE
@@ -32522,7 +32522,7 @@ _OBJC_METACLASS_$_WebCoreRenderThemeNotificationObserver
 _OBJC_CLASS_$_WebCoreTextFieldCell
 _OBJC_METACLASS_$_WebCoreTextFieldCell
 __ZTVN7WebCore23InspectorLayerTreeAgentE
-__ZTVN7WebCore16AbstractDatabaseE
+__ZTVN7WebCore15DatabaseBackendE
 __ZTVN7WebCore14AbstractWorkerE
 __ZTVN7WebCore21AccessibilityARIAGridE
 __ZTVN7WebCore25AccessibilityARIAGridCellE
index aee6605..53e1745 100755 (executable)
                                Name="webdatabase"
                                >
                                <File
-                                       RelativePath="..\Modules\webdatabase\AbstractDatabase.cpp"
-                                       >
-                               </File>
-                               <File
-                                       RelativePath="..\Modules\webdatabase\AbstractDatabase.h"
-                                       >
-                               </File>
-                               <File
                                        RelativePath="..\Modules\webdatabase\AbstractDatabaseServer.h"
                                        >
                                </File>
                                        >
                                </File>
                                <File
+                                       RelativePath="..\Modules\webdatabase\DatabaseBackend.cpp"
+                                       >
+                               </File>
+                               <File
+                                       RelativePath="..\Modules\webdatabase\DatabaseBackend.h"
+                                       >
+                               </File>
+                               <File
                                        RelativePath="..\Modules\webdatabase\DatabaseCallback.h"
                                        >
                                </File>
index b125ec0..8ecfd8e 100644 (file)
     <ClCompile Include="..\Modules\notifications\Notification.cpp" />
     <ClCompile Include="..\Modules\notifications\NotificationCenter.cpp" />
     <ClCompile Include="..\Modules\notifications\WorkerContextNotifications.cpp" />
-    <ClCompile Include="..\Modules\webdatabase\AbstractDatabase.cpp" />
     <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp" />
     <ClCompile Include="..\Modules\webdatabase\Database.cpp" />
     <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp" />
+    <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp" />
     <ClCompile Include="..\Modules\webdatabase\DatabaseContext.cpp" />
     <ClCompile Include="..\Modules\webdatabase\DatabaseManager.cpp" />
     <ClCompile Include="..\Modules\webdatabase\DatabaseSync.cpp" />
     <ClInclude Include="..\Modules\notifications\NotificationCenter.h" />
     <ClInclude Include="..\Modules\notifications\NotificationClient.h" />
     <ClInclude Include="..\Modules\notifications\WorkerContextNotifications.h" />
-    <ClInclude Include="..\Modules\webdatabase\AbstractDatabase.h" />
     <ClInclude Include="..\Modules\webdatabase\AbstractDatabaseServer.h" />
     <ClInclude Include="..\Modules\webdatabase\ChangeVersionWrapper.h" />
     <ClInclude Include="..\Modules\webdatabase\Database.h" />
     <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h" />
+    <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h" />
     <ClInclude Include="..\Modules\webdatabase\DatabaseCallback.h" />
     <ClInclude Include="..\Modules\webdatabase\DatabaseContext.h" />
     <ClInclude Include="..\Modules\webdatabase\DatabaseManager.h" />
index d8ed75a..711caf6 100644 (file)
     <ClCompile Include="..\Modules\notifications\WorkerContextNotifications.cpp">
       <Filter>Modules\notifications</Filter>
     </ClCompile>
-    <ClCompile Include="..\Modules\webdatabase\AbstractDatabase.cpp">
-      <Filter>Modules\webdatabase</Filter>
-    </ClCompile>
     <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp">
       <Filter>Modules\webdatabase</Filter>
     </ClCompile>
     <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp">
       <Filter>Modules\webdatabase</Filter>
     </ClCompile>
+    <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp">
+      <Filter>Modules\webdatabase</Filter>
+    </ClCompile>
     <ClCompile Include="..\Modules\webdatabase\DatabaseContext.cpp">
       <Filter>Modules\webdatabase</Filter>
     </ClCompile>
     <ClInclude Include="..\Modules\notifications\WorkerContextNotifications.h">
       <Filter>Modules\notifications</Filter>
     </ClInclude>
-    <ClInclude Include="..\Modules\webdatabase\AbstractDatabase.h">
-      <Filter>Modules\webdatabase</Filter>
-    </ClInclude>
     <ClInclude Include="..\Modules\webdatabase\AbstractDatabaseServer.h">
       <Filter>Modules\webdatabase</Filter>
     </ClInclude>
     <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h">
       <Filter>Modules\webdatabase</Filter>
     </ClInclude>
+    <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h">
+      <Filter>Modules\webdatabase</Filter>
+    </ClInclude>
     <ClInclude Include="..\Modules\webdatabase\DatabaseCallback.h">
       <Filter>Modules\webdatabase</Filter>
     </ClInclude>
index c5c007e..ecd196b 100644 (file)
                97B38E27151C4271004622E9 /* DOMWindowNotifications.h in Headers */ = {isa = PBXBuildFile; fileRef = 97B38E24151C4264004622E9 /* DOMWindowNotifications.h */; };
                97B38E28151C4273004622E9 /* DOMWindowNotifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97B38E23151C4264004622E9 /* DOMWindowNotifications.cpp */; };
                97B8FFD116AE7F960038388D /* CharacterReferenceParserInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 97B8FFCF16AE7F920038388D /* CharacterReferenceParserInlines.h */; };
-               97BC69DA1505F076001B74AC /* AbstractDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69D61505F076001B74AC /* AbstractDatabase.cpp */; };
-               97BC69DB1505F076001B74AC /* AbstractDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69D71505F076001B74AC /* AbstractDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };
                97BC69DC1505F076001B74AC /* ChangeVersionWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */; };
                97BC69DD1505F076001B74AC /* ChangeVersionWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69D91505F076001B74AC /* ChangeVersionWrapper.h */; };
                97BC6A201505F081001B74AC /* Database.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69DE1505F081001B74AC /* Database.cpp */; };
                97BC6A211505F081001B74AC /* Database.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69DF1505F081001B74AC /* Database.h */; };
                97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */; };
                97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */; };
+               97BC69DA1505F076001B74AC /* DatabaseBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69D61505F076001B74AC /* DatabaseBackend.cpp */; };
+               97BC69DB1505F076001B74AC /* DatabaseBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69D71505F076001B74AC /* DatabaseBackend.h */; settings = {ATTRIBUTES = (Private, ); }; };
                97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69E31505F081001B74AC /* DatabaseCallback.h */; };
                97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69E51505F081001B74AC /* DatabaseContext.cpp */; };
                97BC6A281505F081001B74AC /* DatabaseContext.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69E61505F081001B74AC /* DatabaseContext.h */; settings = {ATTRIBUTES = (Private, ); }; };
                97B38E24151C4264004622E9 /* DOMWindowNotifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DOMWindowNotifications.h; path = Modules/notifications/DOMWindowNotifications.h; sourceTree = "<group>"; };
                97B38E25151C4264004622E9 /* DOMWindowNotifications.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowNotifications.idl; path = Modules/notifications/DOMWindowNotifications.idl; sourceTree = "<group>"; };
                97B8FFCF16AE7F920038388D /* CharacterReferenceParserInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterReferenceParserInlines.h; sourceTree = "<group>"; };
-               97BC69D61505F076001B74AC /* AbstractDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AbstractDatabase.cpp; path = Modules/webdatabase/AbstractDatabase.cpp; sourceTree = "<group>"; };
-               97BC69D71505F076001B74AC /* AbstractDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AbstractDatabase.h; path = Modules/webdatabase/AbstractDatabase.h; sourceTree = "<group>"; };
                97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChangeVersionWrapper.cpp; path = Modules/webdatabase/ChangeVersionWrapper.cpp; sourceTree = "<group>"; };
                97BC69D91505F076001B74AC /* ChangeVersionWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChangeVersionWrapper.h; path = Modules/webdatabase/ChangeVersionWrapper.h; sourceTree = "<group>"; };
                97BC69DE1505F081001B74AC /* Database.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Database.cpp; path = Modules/webdatabase/Database.cpp; sourceTree = "<group>"; };
                97BC69E01505F081001B74AC /* Database.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = Database.idl; path = Modules/webdatabase/Database.idl; sourceTree = "<group>"; };
                97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseAuthorizer.cpp; path = Modules/webdatabase/DatabaseAuthorizer.cpp; sourceTree = "<group>"; };
                97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseAuthorizer.h; path = Modules/webdatabase/DatabaseAuthorizer.h; sourceTree = "<group>"; };
+               97BC69D61505F076001B74AC /* DatabaseBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseBackend.cpp; path = Modules/webdatabase/DatabaseBackend.cpp; sourceTree = "<group>"; };
+               97BC69D71505F076001B74AC /* DatabaseBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseBackend.h; path = Modules/webdatabase/DatabaseBackend.h; sourceTree = "<group>"; };
                97BC69E31505F081001B74AC /* DatabaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseCallback.h; path = Modules/webdatabase/DatabaseCallback.h; sourceTree = "<group>"; };
                97BC69E41505F081001B74AC /* DatabaseCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DatabaseCallback.idl; path = Modules/webdatabase/DatabaseCallback.idl; sourceTree = "<group>"; };
                97BC69E51505F081001B74AC /* DatabaseContext.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseContext.cpp; path = Modules/webdatabase/DatabaseContext.cpp; sourceTree = "<group>"; };
                97BC69D51505F054001B74AC /* webdatabase */ = {
                        isa = PBXGroup;
                        children = (
-                               97BC69D61505F076001B74AC /* AbstractDatabase.cpp */,
-                               97BC69D71505F076001B74AC /* AbstractDatabase.h */,
                                FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */,
                                97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */,
                                97BC69D91505F076001B74AC /* ChangeVersionWrapper.h */,
                                97BC69E01505F081001B74AC /* Database.idl */,
                                97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */,
                                97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */,
+                               97BC69D61505F076001B74AC /* DatabaseBackend.cpp */,
+                               97BC69D71505F076001B74AC /* DatabaseBackend.h */,
                                FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */,
                                97BC69E31505F081001B74AC /* DatabaseCallback.h */,
                                97BC69E41505F081001B74AC /* DatabaseCallback.idl */,
                        isa = PBXHeadersBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               97BC69DB1505F076001B74AC /* AbstractDatabase.h in Headers */,
                                FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */,
                                41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */,
                                29A8122E0FBB9C1D00510293 /* AccessibilityARIAGridCell.h in Headers */,
                                A80E6D0B0A1989CA007FB8C5 /* DashboardRegion.h in Headers */,
                                97BC6A211505F081001B74AC /* Database.h in Headers */,
                                97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */,
+                               97BC69DB1505F076001B74AC /* DatabaseBackend.h in Headers */,
                                FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */,
                                97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */,
                                97BC6A281505F081001B74AC /* DatabaseContext.h in Headers */,
                        isa = PBXSourcesBuildPhase;
                        buildActionMask = 2147483647;
                        files = (
-                               97BC69DA1505F076001B74AC /* AbstractDatabase.cpp in Sources */,
                                41E1B1D00FF5986900576B3B /* AbstractWorker.cpp in Sources */,
                                0F29C16E1300C2E2002D794E /* AccessibilityAllInOne.cpp in Sources */,
                                76CDD2F21103DA6600680521 /* AccessibilityMenuList.cpp in Sources */,
                                A29532CF15DD5E1700469EBC /* CustomFilterValidatedProgram.cpp in Sources */,
                                97BC6A201505F081001B74AC /* Database.cpp in Sources */,
                                97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */,
+                               97BC69DA1505F076001B74AC /* DatabaseBackend.cpp in Sources */,
                                97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */,
                                FE456F181677D74E005EDDF9 /* DatabaseManager.cpp in Sources */,
                                FEDEF84116797108000E444A /* DatabaseStrategy.cpp in Sources */,
index 5b9cbe1..c67c27a 100644 (file)
@@ -1,3 +1,28 @@
+2013-01-29  Mark Lam  <mark.lam@apple.com>
+
+        Rename AbstractDatabase to DatabaseBackend.
+        https://bugs.webkit.org/show_bug.cgi?id=108275.
+
+        Reviewed by Sam Weinig.
+
+        This is a pure rename operation as part of the webdatabase refactoring
+        effort. There is no semantic change in this patch.
+
+        * public/WebDatabase.h:
+        (WebDatabase):
+        * src/DatabaseObserver.cpp:
+        (WebCore::DatabaseObserver::databaseOpened):
+        (WebCore::DatabaseObserver::databaseModified):
+        (WebCore::DatabaseObserver::databaseClosed):
+        (WebCore::DatabaseObserver::reportOpenDatabaseResult):
+        (WebCore::DatabaseObserver::reportChangeVersionResult):
+        (WebCore::DatabaseObserver::reportStartTransactionResult):
+        (WebCore::DatabaseObserver::reportCommitTransactionResult):
+        (WebCore::DatabaseObserver::reportExecuteStatementResult):
+        (WebCore::DatabaseObserver::reportVacuumDatabaseResult):
+        * src/WebDatabase.cpp:
+        (WebKit::WebDatabase::WebDatabase):
+
 2013-01-29  Sheriff Bot  <webkit.review.bot@gmail.com>
 
         Unreviewed, rolling out r141153.
index e87a9af..94e4ffb 100644 (file)
@@ -34,7 +34,7 @@
 #include "../../../Platform/chromium/public/WebCommon.h"
 #include "WebSecurityOrigin.h"
 
-namespace WebCore { class AbstractDatabase; }
+namespace WebCore { class DatabaseBackend; }
 
 namespace WebKit {
 
@@ -63,12 +63,12 @@ public:
         const WebString& originIdentifier, const WebString& databaseName);
 
 #if WEBKIT_IMPLEMENTATION
-    WebDatabase(const WebCore::AbstractDatabase*);
+    WebDatabase(const WebCore::DatabaseBackend*);
 #endif
 
 private:
     WebDatabase() { }
-    const WebCore::AbstractDatabase* m_database;
+    const WebCore::DatabaseBackend* m_database;
 };
 
 } // namespace WebKit
index 65c5858..74a08c6 100644 (file)
@@ -33,9 +33,9 @@
 
 #if ENABLE(SQL_DATABASE)
 
-#include "AbstractDatabase.h"
 #include "CrossThreadCopier.h"
 #include "CrossThreadTask.h"
+#include "DatabaseBackend.h"
 #include "Document.h"
 #include "ScriptExecutionContext.h"
 #include "WebCommonWorkerClient.h"
@@ -177,50 +177,50 @@ bool DatabaseObserver::canEstablishDatabase(ScriptExecutionContext* scriptExecut
     return true;
 }
 
-void DatabaseObserver::databaseOpened(AbstractDatabase* database)
+void DatabaseObserver::databaseOpened(DatabaseBackend* database)
 {
     ASSERT(database->scriptExecutionContext()->isContextThread());
     WebDatabase::observer()->databaseOpened(WebDatabase(database));
 }
 
-void DatabaseObserver::databaseModified(AbstractDatabase* database)
+void DatabaseObserver::databaseModified(DatabaseBackend* database)
 {
     ASSERT(database->scriptExecutionContext()->isContextThread());
     WebDatabase::observer()->databaseModified(WebDatabase(database));
 }
 
-void DatabaseObserver::databaseClosed(AbstractDatabase* database)
+void DatabaseObserver::databaseClosed(DatabaseBackend* database)
 {
     ASSERT(database->scriptExecutionContext()->isContextThread());
     WebDatabase::observer()->databaseClosed(WebDatabase(database));
 }
 
-void DatabaseObserver::reportOpenDatabaseResult(AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseObserver::reportOpenDatabaseResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     WebDatabase::observer()->reportOpenDatabaseResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void DatabaseObserver::reportChangeVersionResult(AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseObserver::reportChangeVersionResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     WebDatabase::observer()->reportChangeVersionResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void DatabaseObserver::reportStartTransactionResult(AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseObserver::reportStartTransactionResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     WebDatabase::observer()->reportStartTransactionResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void DatabaseObserver::reportCommitTransactionResult(AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseObserver::reportCommitTransactionResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     WebDatabase::observer()->reportCommitTransactionResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void DatabaseObserver::reportExecuteStatementResult(AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
+void DatabaseObserver::reportExecuteStatementResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)
 {
     WebDatabase::observer()->reportExecuteStatementResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode);
 }
 
-void DatabaseObserver::reportVacuumDatabaseResult(AbstractDatabase* database, int sqliteErrorCode)
+void DatabaseObserver::reportVacuumDatabaseResult(DatabaseBackend* database, int sqliteErrorCode)
 {
     WebDatabase::observer()->reportVacuumDatabaseResult(WebDatabase(database), sqliteErrorCode);
 }
index ef132a1..f617f22 100644 (file)
@@ -31,7 +31,7 @@
 #include "config.h"
 #include "WebDatabase.h"
 
-#include "AbstractDatabase.h"
+#include "DatabaseBackend.h"
 #include "DatabaseManager.h"
 #include "QuotaTracker.h"
 #include "SecurityOrigin.h"
@@ -42,7 +42,7 @@
 
 #if !ENABLE(SQL_DATABASE)
 namespace WebCore {
-class AbstractDatabase {
+class DatabaseBackend {
 public:
     String stringIdentifier() const { return String(); }
     String displayName() const { return String(); }
@@ -127,7 +127,7 @@ void WebDatabase::closeDatabaseImmediately(const WebString& originIdentifier, co
 #endif
 }
 
-WebDatabase::WebDatabase(const AbstractDatabase* database)
+WebDatabase::WebDatabase(const DatabaseBackend* database)
     : m_database(database)
 {
 }