Changeset 141207 in webkit
- Timestamp:
- Jan 29, 2013 7:20:27 PM (11 years ago)
- Location:
- trunk/Source
- Files:
-
- 32 edited
- 2 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/CMakeLists.txt
r141013 r141207 945 945 Modules/webaudio/WaveTable.cpp 946 946 947 Modules/webdatabase/AbstractDatabase.cpp948 947 Modules/webdatabase/ChangeVersionWrapper.cpp 949 948 Modules/webdatabase/DOMWindowWebDatabase.cpp 950 949 Modules/webdatabase/Database.cpp 951 950 Modules/webdatabase/DatabaseAuthorizer.cpp 951 Modules/webdatabase/DatabaseBackend.cpp 952 952 Modules/webdatabase/DatabaseContext.cpp 953 953 Modules/webdatabase/DatabaseManager.cpp -
trunk/Source/WebCore/ChangeLog
r141202 r141207 1 2013-01-29 Mark Lam <mark.lam@apple.com> 2 3 Rename AbstractDatabase to DatabaseBackend. 4 https://bugs.webkit.org/show_bug.cgi?id=108275. 5 6 Reviewed by Sam Weinig. 7 8 This is a pure rename operation as part of the webdatabase refactoring 9 effort. There is no semantic change in this patch. 10 11 No new tests. 12 13 * CMakeLists.txt: 14 * GNUmakefile.list.am: 15 * Modules/webdatabase/AbstractDatabase.cpp: Removed. 16 * Modules/webdatabase/AbstractDatabase.h: Removed. 17 * Modules/webdatabase/AbstractDatabaseServer.h: 18 (WebCore): 19 (AbstractDatabaseServer): 20 * Modules/webdatabase/DBBackendServer.cpp: 21 (WebCore::DBBackend::Server::databaseChanged): 22 (WebCore::DBBackend::Server::addOpenDatabase): 23 (WebCore::DBBackend::Server::removeOpenDatabase): 24 (WebCore::DBBackend::Server::getMaxSizeForDatabase): 25 * Modules/webdatabase/DBBackendServer.h: 26 * Modules/webdatabase/Database.cpp: 27 (WebCore::Database::Database): 28 (WebCore::Database::version): 29 (WebCore::Database::performOpenAndVerify): 30 * Modules/webdatabase/Database.h: 31 * Modules/webdatabase/DatabaseBackend.cpp: Copied from Source/WebCore/Modules/webdatabase/AbstractDatabase.cpp. 32 (WebCore): 33 (WebCore::DatabaseBackend::databaseInfoTableName): 34 (WebCore::DatabaseBackend::DatabaseBackend): 35 (WebCore::DatabaseBackend::~DatabaseBackend): 36 (WebCore::DatabaseBackend::closeDatabase): 37 (WebCore::DatabaseBackend::version): 38 (WebCore::DatabaseBackend::performOpenAndVerify): 39 (WebCore::DatabaseBackend::scriptExecutionContext): 40 (WebCore::DatabaseBackend::securityOrigin): 41 (WebCore::DatabaseBackend::stringIdentifier): 42 (WebCore::DatabaseBackend::displayName): 43 (WebCore::DatabaseBackend::estimatedSize): 44 (WebCore::DatabaseBackend::fileName): 45 (WebCore::DatabaseBackend::details): 46 (WebCore::DatabaseBackend::getVersionFromDatabase): 47 (WebCore::DatabaseBackend::setVersionInDatabase): 48 (WebCore::DatabaseBackend::setExpectedVersion): 49 (WebCore::DatabaseBackend::getCachedVersion): 50 (WebCore::DatabaseBackend::setCachedVersion): 51 (WebCore::DatabaseBackend::getActualVersionForTransaction): 52 (WebCore::DatabaseBackend::disableAuthorizer): 53 (WebCore::DatabaseBackend::enableAuthorizer): 54 (WebCore::DatabaseBackend::setAuthorizerReadOnly): 55 (WebCore::DatabaseBackend::setAuthorizerPermissions): 56 (WebCore::DatabaseBackend::lastActionChangedDatabase): 57 (WebCore::DatabaseBackend::lastActionWasInsert): 58 (WebCore::DatabaseBackend::resetDeletes): 59 (WebCore::DatabaseBackend::hadDeletes): 60 (WebCore::DatabaseBackend::resetAuthorizer): 61 (WebCore::DatabaseBackend::maximumSize): 62 (WebCore::DatabaseBackend::incrementalVacuumIfNeeded): 63 (WebCore::DatabaseBackend::interrupt): 64 (WebCore::DatabaseBackend::isInterrupted): 65 (WebCore::DatabaseBackend::logErrorMessage): 66 (WebCore::DatabaseBackend::reportOpenDatabaseResult): 67 (WebCore::DatabaseBackend::reportChangeVersionResult): 68 (WebCore::DatabaseBackend::reportStartTransactionResult): 69 (WebCore::DatabaseBackend::reportCommitTransactionResult): 70 (WebCore::DatabaseBackend::reportExecuteStatementResult): 71 (WebCore::DatabaseBackend::reportVacuumDatabaseResult): 72 * Modules/webdatabase/DatabaseBackend.h: Copied from Source/WebCore/Modules/webdatabase/AbstractDatabase.h. 73 (DatabaseBackend): 74 * Modules/webdatabase/DatabaseManager.cpp: 75 (WebCore::DatabaseManager::databaseChanged): 76 (WebCore::DatabaseManager::addOpenDatabase): 77 (WebCore::DatabaseManager::removeOpenDatabase): 78 (WebCore::DatabaseManager::getMaxSizeForDatabase): 79 * Modules/webdatabase/DatabaseManager.h: 80 (DatabaseManager): 81 * Modules/webdatabase/DatabaseSync.cpp: 82 (WebCore::DatabaseSync::DatabaseSync): 83 * Modules/webdatabase/DatabaseSync.h: 84 * Modules/webdatabase/DatabaseTracker.cpp: 85 (WebCore::DatabaseTracker::getMaxSizeForDatabase): 86 (WebCore::DatabaseTracker::databaseChanged): 87 (WebCore::DatabaseTracker::interruptAllDatabasesForContext): 88 (WebCore::DatabaseTracker::addOpenDatabase): 89 (WebCore::DatabaseTracker::removeOpenDatabase): 90 (WebCore::DatabaseTracker::getOpenDatabases): 91 (WebCore::DatabaseTracker::deleteDatabaseFile): 92 * Modules/webdatabase/DatabaseTracker.h: 93 (WebCore): 94 (DatabaseTracker): 95 * Modules/webdatabase/OriginQuotaManager.cpp: 96 (WebCore::OriginQuotaManager::markDatabase): 97 * Modules/webdatabase/OriginQuotaManager.h: 98 (WebCore): 99 (OriginQuotaManager): 100 * Modules/webdatabase/SQLTransactionClient.cpp: 101 (WebCore::SQLTransactionClient::didCommitWriteTransaction): 102 (WebCore::SQLTransactionClient::didExecuteStatement): 103 (WebCore::SQLTransactionClient::didExceedQuota): 104 * Modules/webdatabase/SQLTransactionClient.h: 105 (WebCore): 106 (SQLTransactionClient): 107 * Modules/webdatabase/chromium/DatabaseObserver.h: 108 (WebCore): 109 (DatabaseObserver): 110 * Modules/webdatabase/chromium/DatabaseTrackerChromium.cpp: 111 (WebCore::DatabaseTracker::addOpenDatabase): 112 (WebCore::NotifyDatabaseObserverOnCloseTask::create): 113 (WebCore::NotifyDatabaseObserverOnCloseTask::NotifyDatabaseObserverOnCloseTask): 114 (NotifyDatabaseObserverOnCloseTask): 115 (WebCore::DatabaseTracker::removeOpenDatabase): 116 (WebCore::DatabaseTracker::getMaxSizeForDatabase): 117 (WebCore::DatabaseTracker::CloseOneDatabaseImmediatelyTask::create): 118 (WebCore::DatabaseTracker::CloseOneDatabaseImmediatelyTask::CloseOneDatabaseImmediatelyTask): 119 (DatabaseTracker::CloseOneDatabaseImmediatelyTask): 120 (WebCore::DatabaseTracker::closeOneDatabaseImmediately): 121 * Modules/webdatabase/chromium/SQLTransactionClientChromium.cpp: 122 (WebCore::NotifyDatabaseChangedTask::create): 123 (WebCore::NotifyDatabaseChangedTask::NotifyDatabaseChangedTask): 124 (NotifyDatabaseChangedTask): 125 (WebCore::SQLTransactionClient::didCommitWriteTransaction): 126 (WebCore::SQLTransactionClient::didExecuteStatement): 127 (WebCore::SQLTransactionClient::didExceedQuota): 128 * Target.pri: 129 * WebCore.gypi: 130 * WebCore.order: 131 * WebCore.vcproj/WebCore.vcproj: 132 * WebCore.vcxproj/WebCore.vcxproj: 133 * WebCore.vcxproj/WebCore.vcxproj.filters: 134 * WebCore.xcodeproj/project.pbxproj: 135 1 136 2013-01-29 Sheriff Bot <webkit.review.bot@gmail.com> 2 137 -
trunk/Source/WebCore/GNUmakefile.list.am
r141122 r141207 2093 2093 Source/WebCore/Modules/webaudio/WaveTable.cpp \ 2094 2094 Source/WebCore/Modules/webaudio/WaveTable.h \ 2095 Source/WebCore/Modules/webdatabase/AbstractDatabase.cpp \2096 Source/WebCore/Modules/webdatabase/AbstractDatabase.h \2097 2095 Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h \ 2098 2096 Source/WebCore/Modules/webdatabase/ChangeVersionWrapper.cpp \ … … 2104 2102 Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.cpp \ 2105 2103 Source/WebCore/Modules/webdatabase/DatabaseAuthorizer.h \ 2104 Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp \ 2105 Source/WebCore/Modules/webdatabase/DatabaseBackend.h \ 2106 2106 Source/WebCore/Modules/webdatabase/DatabaseBasicTypes.h \ 2107 2107 Source/WebCore/Modules/webdatabase/DatabaseCallback.h \ -
trunk/Source/WebCore/Modules/webdatabase/AbstractDatabaseServer.h
r138085 r141207 36 36 namespace WebCore { 37 37 38 class AbstractDatabase;38 class DatabaseBackend; 39 39 class DatabaseManagerClient; 40 40 class ScriptExecutionContext; … … 68 68 // From a secondary thread, must be thread safe with its data 69 69 virtual void scheduleNotifyDatabaseChanged(SecurityOrigin*, const String& name) = 0; 70 virtual void databaseChanged( AbstractDatabase*) = 0;70 virtual void databaseChanged(DatabaseBackend*) = 0; 71 71 72 72 #else // PLATFORM(CHROMIUM) … … 77 77 78 78 virtual bool canEstablishDatabase(ScriptExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize) = 0; 79 virtual void addOpenDatabase( AbstractDatabase*) = 0;80 virtual void removeOpenDatabase( AbstractDatabase*) = 0;79 virtual void addOpenDatabase(DatabaseBackend*) = 0; 80 virtual void removeOpenDatabase(DatabaseBackend*) = 0; 81 81 82 82 virtual void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize) = 0; 83 virtual unsigned long long getMaxSizeForDatabase(const AbstractDatabase*) = 0;83 virtual unsigned long long getMaxSizeForDatabase(const DatabaseBackend*) = 0; 84 84 85 85 protected: -
trunk/Source/WebCore/Modules/webdatabase/DBBackendServer.cpp
r138088 r141207 131 131 } 132 132 133 void Server::databaseChanged( AbstractDatabase* database)133 void Server::databaseChanged(DatabaseBackend* database) 134 134 { 135 135 DatabaseTracker::tracker().databaseChanged(database); … … 153 153 } 154 154 155 void Server::addOpenDatabase( AbstractDatabase* database)155 void Server::addOpenDatabase(DatabaseBackend* database) 156 156 { 157 157 DatabaseTracker::tracker().addOpenDatabase(database); 158 158 } 159 159 160 void Server::removeOpenDatabase( AbstractDatabase* database)160 void Server::removeOpenDatabase(DatabaseBackend* database) 161 161 { 162 162 DatabaseTracker::tracker().removeOpenDatabase(database); … … 168 168 } 169 169 170 unsigned long long Server::getMaxSizeForDatabase(const AbstractDatabase* database)170 unsigned long long Server::getMaxSizeForDatabase(const DatabaseBackend* database) 171 171 { 172 172 return DatabaseTracker::tracker().getMaxSizeForDatabase(database); -
trunk/Source/WebCore/Modules/webdatabase/DBBackendServer.h
r138085 r141207 64 64 // From a secondary thread, must be thread safe with its data 65 65 virtual void scheduleNotifyDatabaseChanged(SecurityOrigin*, const String& name); 66 virtual void databaseChanged( AbstractDatabase*);66 virtual void databaseChanged(DatabaseBackend*); 67 67 68 68 #else // PLATFORM(CHROMIUM) … … 73 73 74 74 virtual bool canEstablishDatabase(ScriptExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize); 75 virtual void addOpenDatabase( AbstractDatabase*);76 virtual void removeOpenDatabase( AbstractDatabase*);75 virtual void addOpenDatabase(DatabaseBackend*); 76 virtual void removeOpenDatabase(DatabaseBackend*); 77 77 78 78 virtual void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize); 79 virtual unsigned long long getMaxSizeForDatabase(const AbstractDatabase*);79 virtual unsigned long long getMaxSizeForDatabase(const DatabaseBackend*); 80 80 }; 81 81 -
trunk/Source/WebCore/Modules/webdatabase/Database.cpp
r141166 r141207 67 67 68 68 Database::Database(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, const String& displayName, unsigned long estimatedSize) 69 : AbstractDatabase(databaseContext, name, expectedVersion, displayName, estimatedSize, AsyncDatabase)69 : DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, AsyncDatabase) 70 70 , m_transactionInProgress(false) 71 71 , m_isTransactionQueueEnabled(true) … … 118 118 if (m_deleted) 119 119 return String(); 120 return AbstractDatabase::version();120 return DatabaseBackend::version(); 121 121 } 122 122 … … 192 192 bool Database::performOpenAndVerify(bool setVersionInNewDatabase, ExceptionCode& e, String& errorMessage) 193 193 { 194 if ( AbstractDatabase::performOpenAndVerify(setVersionInNewDatabase, e, errorMessage)) {194 if (DatabaseBackend::performOpenAndVerify(setVersionInNewDatabase, e, errorMessage)) { 195 195 if (databaseContext()->databaseThread()) 196 196 databaseContext()->databaseThread()->recordDatabaseOpen(this); -
trunk/Source/WebCore/Modules/webdatabase/Database.h
r141166 r141207 32 32 #if ENABLE(SQL_DATABASE) 33 33 34 #include " AbstractDatabase.h"34 #include "DatabaseBackend.h" 35 35 #include "DatabaseBasicTypes.h" 36 36 #include <wtf/Deque.h> … … 50 50 class VoidCallback; 51 51 52 class Database : public AbstractDatabase{52 class Database : public DatabaseBackend { 53 53 public: 54 54 virtual ~Database(); -
trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.cpp
r141187 r141207 28 28 29 29 #include "config.h" 30 #include " AbstractDatabase.h"30 #include "DatabaseBackend.h" 31 31 32 32 #if ENABLE(SQL_DATABASE) … … 141 141 } 142 142 143 typedef HashMap<DatabaseGuid, HashSet< AbstractDatabase*>*> GuidDatabaseMap;143 typedef HashMap<DatabaseGuid, HashSet<DatabaseBackend*>*> GuidDatabaseMap; 144 144 static GuidDatabaseMap& guidToDatabaseMap() 145 145 { … … 170 170 171 171 // static 172 const char* AbstractDatabase::databaseInfoTableName()172 const char* DatabaseBackend::databaseInfoTableName() 173 173 { 174 174 return infoTableName; 175 175 } 176 176 177 AbstractDatabase::AbstractDatabase(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion,178 177 DatabaseBackend::DatabaseBackend(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, 178 const String& displayName, unsigned long estimatedSize, DatabaseType databaseType) 179 179 : m_databaseContext(databaseContext) 180 180 , m_scriptExecutionContext(m_databaseContext->scriptExecutionContext()) … … 199 199 MutexLocker locker(guidMutex()); 200 200 m_guid = guidForOriginAndName(securityOrigin()->toString(), name); 201 HashSet< AbstractDatabase*>* hashSet = guidToDatabaseMap().get(m_guid);201 HashSet<DatabaseBackend*>* hashSet = guidToDatabaseMap().get(m_guid); 202 202 if (!hashSet) { 203 hashSet = new HashSet< AbstractDatabase*>;203 hashSet = new HashSet<DatabaseBackend*>; 204 204 guidToDatabaseMap().set(m_guid, hashSet); 205 205 } … … 212 212 } 213 213 214 AbstractDatabase::~AbstractDatabase()214 DatabaseBackend::~DatabaseBackend() 215 215 { 216 216 ASSERT(!m_opened); 217 217 } 218 218 219 void AbstractDatabase::closeDatabase()219 void DatabaseBackend::closeDatabase() 220 220 { 221 221 if (!m_opened) … … 227 227 MutexLocker locker(guidMutex()); 228 228 229 HashSet< AbstractDatabase*>* hashSet = guidToDatabaseMap().get(m_guid);229 HashSet<DatabaseBackend*>* hashSet = guidToDatabaseMap().get(m_guid); 230 230 ASSERT(hashSet); 231 231 ASSERT(hashSet->contains(this)); … … 239 239 } 240 240 241 String AbstractDatabase::version() const241 String DatabaseBackend::version() const 242 242 { 243 243 // Note: In multi-process browsers the cached value may be accurate, but we cannot read the … … 247 247 } 248 248 249 bool AbstractDatabase::performOpenAndVerify(bool shouldSetVersionInNewDatabase, ExceptionCode& ec, String& errorMessage)249 bool DatabaseBackend::performOpenAndVerify(bool shouldSetVersionInNewDatabase, ExceptionCode& ec, String& errorMessage) 250 250 { 251 251 ASSERT(errorMessage.isEmpty()); … … 370 370 } 371 371 372 ScriptExecutionContext* AbstractDatabase::scriptExecutionContext() const372 ScriptExecutionContext* DatabaseBackend::scriptExecutionContext() const 373 373 { 374 374 return m_scriptExecutionContext.get(); 375 375 } 376 376 377 SecurityOrigin* AbstractDatabase::securityOrigin() const377 SecurityOrigin* DatabaseBackend::securityOrigin() const 378 378 { 379 379 return m_contextThreadSecurityOrigin.get(); 380 380 } 381 381 382 String AbstractDatabase::stringIdentifier() const382 String DatabaseBackend::stringIdentifier() const 383 383 { 384 384 // Return a deep copy for ref counting thread safety … … 386 386 } 387 387 388 String AbstractDatabase::displayName() const388 String DatabaseBackend::displayName() const 389 389 { 390 390 // Return a deep copy for ref counting thread safety … … 392 392 } 393 393 394 unsigned long AbstractDatabase::estimatedSize() const394 unsigned long DatabaseBackend::estimatedSize() const 395 395 { 396 396 return m_estimatedSize; 397 397 } 398 398 399 String AbstractDatabase::fileName() const399 String DatabaseBackend::fileName() const 400 400 { 401 401 // Return a deep copy for ref counting thread safety … … 403 403 } 404 404 405 DatabaseDetails AbstractDatabase::details() const405 DatabaseDetails DatabaseBackend::details() const 406 406 { 407 407 return DatabaseDetails(stringIdentifier(), displayName(), estimatedSize(), 0); 408 408 } 409 409 410 bool AbstractDatabase::getVersionFromDatabase(String& version, bool shouldCacheVersion)410 bool DatabaseBackend::getVersionFromDatabase(String& version, bool shouldCacheVersion) 411 411 { 412 412 String query(String("SELECT value FROM ") + infoTableName + " WHERE key = '" + versionKey + "';"); … … 426 426 } 427 427 428 bool AbstractDatabase::setVersionInDatabase(const String& version, bool shouldCacheVersion)428 bool DatabaseBackend::setVersionInDatabase(const String& version, bool shouldCacheVersion) 429 429 { 430 430 // The INSERT will replace an existing entry for the database with the new version number, due to the UNIQUE ON CONFLICT REPLACE … … 446 446 } 447 447 448 void AbstractDatabase::setExpectedVersion(const String& version)448 void DatabaseBackend::setExpectedVersion(const String& version) 449 449 { 450 450 m_expectedVersion = version.isolatedCopy(); 451 451 } 452 452 453 String AbstractDatabase::getCachedVersion() const453 String DatabaseBackend::getCachedVersion() const 454 454 { 455 455 MutexLocker locker(guidMutex()); … … 457 457 } 458 458 459 void AbstractDatabase::setCachedVersion(const String& actualVersion)459 void DatabaseBackend::setCachedVersion(const String& actualVersion) 460 460 { 461 461 // Update the in memory database version map. … … 464 464 } 465 465 466 bool AbstractDatabase::getActualVersionForTransaction(String &actualVersion)466 bool DatabaseBackend::getActualVersionForTransaction(String &actualVersion) 467 467 { 468 468 ASSERT(m_sqliteDatabase.transactionInProgress()); … … 477 477 } 478 478 479 void AbstractDatabase::disableAuthorizer()479 void DatabaseBackend::disableAuthorizer() 480 480 { 481 481 ASSERT(m_databaseAuthorizer); … … 483 483 } 484 484 485 void AbstractDatabase::enableAuthorizer()485 void DatabaseBackend::enableAuthorizer() 486 486 { 487 487 ASSERT(m_databaseAuthorizer); … … 489 489 } 490 490 491 void AbstractDatabase::setAuthorizerReadOnly()491 void DatabaseBackend::setAuthorizerReadOnly() 492 492 { 493 493 ASSERT(m_databaseAuthorizer); … … 495 495 } 496 496 497 void AbstractDatabase::setAuthorizerPermissions(int permissions)497 void DatabaseBackend::setAuthorizerPermissions(int permissions) 498 498 { 499 499 ASSERT(m_databaseAuthorizer); … … 501 501 } 502 502 503 bool AbstractDatabase::lastActionChangedDatabase()503 bool DatabaseBackend::lastActionChangedDatabase() 504 504 { 505 505 ASSERT(m_databaseAuthorizer); … … 507 507 } 508 508 509 bool AbstractDatabase::lastActionWasInsert()509 bool DatabaseBackend::lastActionWasInsert() 510 510 { 511 511 ASSERT(m_databaseAuthorizer); … … 513 513 } 514 514 515 void AbstractDatabase::resetDeletes()515 void DatabaseBackend::resetDeletes() 516 516 { 517 517 ASSERT(m_databaseAuthorizer); … … 519 519 } 520 520 521 bool AbstractDatabase::hadDeletes()521 bool DatabaseBackend::hadDeletes() 522 522 { 523 523 ASSERT(m_databaseAuthorizer); … … 525 525 } 526 526 527 void AbstractDatabase::resetAuthorizer()527 void DatabaseBackend::resetAuthorizer() 528 528 { 529 529 if (m_databaseAuthorizer) … … 531 531 } 532 532 533 unsigned long long AbstractDatabase::maximumSize() const533 unsigned long long DatabaseBackend::maximumSize() const 534 534 { 535 535 return DatabaseManager::manager().getMaxSizeForDatabase(this); 536 536 } 537 537 538 void AbstractDatabase::incrementalVacuumIfNeeded()538 void DatabaseBackend::incrementalVacuumIfNeeded() 539 539 { 540 540 int64_t freeSpaceSize = m_sqliteDatabase.freeSpaceSize(); … … 548 548 } 549 549 550 void AbstractDatabase::interrupt()550 void DatabaseBackend::interrupt() 551 551 { 552 552 m_sqliteDatabase.interrupt(); 553 553 } 554 554 555 bool AbstractDatabase::isInterrupted()555 bool DatabaseBackend::isInterrupted() 556 556 { 557 557 MutexLocker locker(m_sqliteDatabase.databaseMutex()); … … 559 559 } 560 560 561 void AbstractDatabase::logErrorMessage(const String& message)561 void DatabaseBackend::logErrorMessage(const String& message) 562 562 { 563 563 m_scriptExecutionContext->addConsoleMessage(OtherMessageSource, ErrorMessageLevel, message); … … 567 567 // These are used to generate histograms of errors seen with websql. 568 568 // See about:histograms in chromium. 569 void AbstractDatabase::reportOpenDatabaseResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)569 void DatabaseBackend::reportOpenDatabaseResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode) 570 570 { 571 571 DatabaseObserver::reportOpenDatabaseResult(this, errorSite, webSqlErrorCode, sqliteErrorCode); 572 572 } 573 573 574 void AbstractDatabase::reportChangeVersionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)574 void DatabaseBackend::reportChangeVersionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode) 575 575 { 576 576 DatabaseObserver::reportChangeVersionResult(this, errorSite, webSqlErrorCode, sqliteErrorCode); 577 577 } 578 578 579 void AbstractDatabase::reportStartTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)579 void DatabaseBackend::reportStartTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode) 580 580 { 581 581 DatabaseObserver::reportStartTransactionResult(this, errorSite, webSqlErrorCode, sqliteErrorCode); 582 582 } 583 583 584 void AbstractDatabase::reportCommitTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)584 void DatabaseBackend::reportCommitTransactionResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode) 585 585 { 586 586 DatabaseObserver::reportCommitTransactionResult(this, errorSite, webSqlErrorCode, sqliteErrorCode); 587 587 } 588 588 589 void AbstractDatabase::reportExecuteStatementResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode)589 void DatabaseBackend::reportExecuteStatementResult(int errorSite, int webSqlErrorCode, int sqliteErrorCode) 590 590 { 591 591 DatabaseObserver::reportExecuteStatementResult(this, errorSite, webSqlErrorCode, sqliteErrorCode); 592 592 } 593 593 594 void AbstractDatabase::reportVacuumDatabaseResult(int sqliteErrorCode)594 void DatabaseBackend::reportVacuumDatabaseResult(int sqliteErrorCode) 595 595 { 596 596 DatabaseObserver::reportVacuumDatabaseResult(this, sqliteErrorCode); … … 598 598 599 599 #else 600 void AbstractDatabase::reportOpenDatabaseResult(int, int, int) { }601 void AbstractDatabase::reportChangeVersionResult(int, int, int) { }602 void AbstractDatabase::reportStartTransactionResult(int, int, int) { }603 void AbstractDatabase::reportCommitTransactionResult(int, int, int) { }604 void AbstractDatabase::reportExecuteStatementResult(int, int, int) { }605 void AbstractDatabase::reportVacuumDatabaseResult(int) { }600 void DatabaseBackend::reportOpenDatabaseResult(int, int, int) { } 601 void DatabaseBackend::reportChangeVersionResult(int, int, int) { } 602 void DatabaseBackend::reportStartTransactionResult(int, int, int) { } 603 void DatabaseBackend::reportCommitTransactionResult(int, int, int) { } 604 void DatabaseBackend::reportExecuteStatementResult(int, int, int) { } 605 void DatabaseBackend::reportVacuumDatabaseResult(int) { } 606 606 #endif // PLATFORM(CHROMIUM) 607 607 -
trunk/Source/WebCore/Modules/webdatabase/DatabaseBackend.h
r141187 r141207 27 27 */ 28 28 29 #ifndef AbstractDatabase_h30 #define AbstractDatabase_h29 #ifndef DatabaseBackend_h 30 #define DatabaseBackend_h 31 31 32 32 #if ENABLE(SQL_DATABASE) … … 51 51 class SecurityOrigin; 52 52 53 class AbstractDatabase : public ThreadSafeRefCounted<AbstractDatabase> {53 class DatabaseBackend : public ThreadSafeRefCounted<DatabaseBackend> { 54 54 public: 55 virtual ~ AbstractDatabase();55 virtual ~DatabaseBackend(); 56 56 57 57 virtual String version() const; … … 102 102 }; 103 103 104 AbstractDatabase(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion,105 104 DatabaseBackend(PassRefPtr<DatabaseContext>, const String& name, const String& expectedVersion, 105 const String& displayName, unsigned long estimatedSize, DatabaseType); 106 106 107 107 void closeDatabase(); … … 157 157 #endif // ENABLE(SQL_DATABASE) 158 158 159 #endif // AbstractDatabase_h159 #endif // DatabaseBackend_h -
trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.cpp
r141166 r141207 29 29 #if ENABLE(SQL_DATABASE) 30 30 31 #include "AbstractDatabase.h"32 31 #include "Database.h" 32 #include "DatabaseBackend.h" 33 33 #include "DatabaseCallback.h" 34 34 #include "DatabaseContext.h" … … 339 339 } 340 340 341 void DatabaseManager::databaseChanged( AbstractDatabase* database)341 void DatabaseManager::databaseChanged(DatabaseBackend* database) 342 342 { 343 343 m_server->databaseChanged(database); … … 363 363 } 364 364 365 void DatabaseManager::addOpenDatabase( AbstractDatabase* database)365 void DatabaseManager::addOpenDatabase(DatabaseBackend* database) 366 366 { 367 367 m_server->addOpenDatabase(database); 368 368 } 369 369 370 void DatabaseManager::removeOpenDatabase( AbstractDatabase* database)370 void DatabaseManager::removeOpenDatabase(DatabaseBackend* database) 371 371 { 372 372 m_server->removeOpenDatabase(database); … … 378 378 } 379 379 380 unsigned long long DatabaseManager::getMaxSizeForDatabase(const AbstractDatabase* database)380 unsigned long long DatabaseManager::getMaxSizeForDatabase(const DatabaseBackend* database) 381 381 { 382 382 return m_server->getMaxSizeForDatabase(database); -
trunk/Source/WebCore/Modules/webdatabase/DatabaseManager.h
r141166 r141207 104 104 void scheduleNotifyDatabaseChanged(SecurityOrigin*, const String& name); 105 105 106 void databaseChanged( AbstractDatabase*);106 void databaseChanged(DatabaseBackend*); 107 107 108 108 #else // PLATFORM(CHROMIUM) … … 113 113 114 114 bool canEstablishDatabase(ScriptExecutionContext*, const String& name, const String& displayName, unsigned long estimatedSize); 115 void addOpenDatabase( AbstractDatabase*);116 void removeOpenDatabase( AbstractDatabase*);115 void addOpenDatabase(DatabaseBackend*); 116 void removeOpenDatabase(DatabaseBackend*); 117 117 118 118 void setDatabaseDetails(SecurityOrigin*, const String& name, const String& displayName, unsigned long estimatedSize); 119 unsigned long long getMaxSizeForDatabase(const AbstractDatabase*);119 unsigned long long getMaxSizeForDatabase(const DatabaseBackend*); 120 120 121 121 private: -
trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.cpp
r141166 r141207 51 51 DatabaseSync::DatabaseSync(PassRefPtr<DatabaseContext> databaseContext, const String& name, const String& expectedVersion, 52 52 const String& displayName, unsigned long estimatedSize) 53 : AbstractDatabase(databaseContext, name, expectedVersion, displayName, estimatedSize, SyncDatabase)53 : DatabaseBackend(databaseContext, name, expectedVersion, displayName, estimatedSize, SyncDatabase) 54 54 { 55 55 } -
trunk/Source/WebCore/Modules/webdatabase/DatabaseSync.h
r141166 r141207 34 34 #if ENABLE(SQL_DATABASE) 35 35 36 #include " AbstractDatabase.h"36 #include "DatabaseBackend.h" 37 37 #include "DatabaseBasicTypes.h" 38 38 #include <wtf/Forward.h> … … 51 51 52 52 // Instances of this class should be created and used only on the worker's context thread. 53 class DatabaseSync : public AbstractDatabase{53 class DatabaseSync : public DatabaseBackend { 54 54 public: 55 55 virtual ~DatabaseSync(); -
trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.cpp
r141166 r141207 32 32 #if ENABLE(SQL_DATABASE) 33 33 34 #include "AbstractDatabase.h"35 34 #include "Chrome.h" 36 35 #include "ChromeClient.h" 36 #include "DatabaseBackend.h" 37 37 #include "DatabaseContext.h" 38 38 #include "DatabaseManager.h" … … 214 214 } 215 215 216 unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase* database)216 unsigned long long DatabaseTracker::getMaxSizeForDatabase(const DatabaseBackend* database) 217 217 { 218 218 // The maximum size for a database is the full quota for its origin, minus the current usage within the origin, … … 224 224 } 225 225 226 void DatabaseTracker::databaseChanged( AbstractDatabase* database)226 void DatabaseTracker::databaseChanged(DatabaseBackend* database) 227 227 { 228 228 Locker<OriginQuotaManager> quotaManagerLocker(originQuotaManager()); … … 232 232 void DatabaseTracker::interruptAllDatabasesForContext(const ScriptExecutionContext* context) 233 233 { 234 Vector<RefPtr< AbstractDatabase> > openDatabases;234 Vector<RefPtr<DatabaseBackend> > openDatabases; 235 235 { 236 236 MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard); … … 254 254 } 255 255 256 Vector<RefPtr< AbstractDatabase> >::const_iterator openDatabasesEndIt = openDatabases.end();257 for (Vector<RefPtr< AbstractDatabase> >::const_iterator openDatabasesIt = openDatabases.begin(); openDatabasesIt != openDatabasesEndIt; ++openDatabasesIt)256 Vector<RefPtr<DatabaseBackend> >::const_iterator openDatabasesEndIt = openDatabases.end(); 257 for (Vector<RefPtr<DatabaseBackend> >::const_iterator openDatabasesIt = openDatabases.begin(); openDatabasesIt != openDatabasesEndIt; ++openDatabasesIt) 258 258 (*openDatabasesIt)->interrupt(); 259 259 } … … 493 493 } 494 494 495 void DatabaseTracker::addOpenDatabase( AbstractDatabase* database)495 void DatabaseTracker::addOpenDatabase(DatabaseBackend* database) 496 496 { 497 497 if (!database) … … 532 532 } 533 533 534 void DatabaseTracker::removeOpenDatabase( AbstractDatabase* database)534 void DatabaseTracker::removeOpenDatabase(DatabaseBackend* database) 535 535 { 536 536 if (!database) … … 579 579 } 580 580 581 void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr< AbstractDatabase> >* databases)581 void DatabaseTracker::getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<DatabaseBackend> >* databases) 582 582 { 583 583 MutexLocker openDatabaseMapLock(m_openDatabaseMapGuard); … … 1001 1001 #endif 1002 1002 1003 Vector<RefPtr< AbstractDatabase> > deletedDatabases;1003 Vector<RefPtr<DatabaseBackend> > deletedDatabases; 1004 1004 1005 1005 // Make sure not to hold the any locks when calling -
trunk/Source/WebCore/Modules/webdatabase/DatabaseTracker.h
r139078 r141207 45 45 namespace WebCore { 46 46 47 class AbstractDatabase;47 class DatabaseBackend; 48 48 class ScriptExecutionContext; 49 49 class SecurityOrigin; … … 75 75 String fullPathForDatabase(SecurityOrigin*, const String& name, bool createIfDoesNotExist = true); 76 76 77 void addOpenDatabase( AbstractDatabase*);78 void removeOpenDatabase( AbstractDatabase*);79 void getOpenDatabases(SecurityOrigin* origin, const String& name, HashSet<RefPtr<AbstractDatabase> >* databases);77 void addOpenDatabase(DatabaseBackend*); 78 void removeOpenDatabase(DatabaseBackend*); 79 void getOpenDatabases(SecurityOrigin*, const String& name, HashSet<RefPtr<DatabaseBackend> >* databases); 80 80 81 unsigned long long getMaxSizeForDatabase(const AbstractDatabase*);82 void databaseChanged( AbstractDatabase*);81 unsigned long long getMaxSizeForDatabase(const DatabaseBackend*); 82 void databaseChanged(DatabaseBackend*); 83 83 84 84 void interruptAllDatabasesForContext(const ScriptExecutionContext*); … … 132 132 bool deleteDatabaseFile(SecurityOrigin*, const String& name); 133 133 134 typedef HashSet< AbstractDatabase*> DatabaseSet;134 typedef HashSet<DatabaseBackend*> DatabaseSet; 135 135 typedef HashMap<String, DatabaseSet*> DatabaseNameMap; 136 136 typedef HashMap<RefPtr<SecurityOrigin>, DatabaseNameMap*, SecurityOriginHash> DatabaseOriginMap; … … 176 176 177 177 private: 178 typedef HashSet< AbstractDatabase*> DatabaseSet;178 typedef HashSet<DatabaseBackend*> DatabaseSet; 179 179 typedef HashMap<String, DatabaseSet*> DatabaseNameMap; 180 180 typedef HashMap<String, DatabaseNameMap*> DatabaseOriginMap; 181 181 class CloseOneDatabaseImmediatelyTask; 182 182 183 void closeOneDatabaseImmediately(const String& originIdentifier, const String& name, AbstractDatabase* database);183 void closeOneDatabaseImmediately(const String& originIdentifier, const String& name, DatabaseBackend*); 184 184 185 185 Mutex m_openDatabaseMapGuard; -
trunk/Source/WebCore/Modules/webdatabase/OriginQuotaManager.cpp
r109877 r141207 31 31 #if ENABLE(SQL_DATABASE) 32 32 33 #include " AbstractDatabase.h"33 #include "DatabaseBackend.h" 34 34 #include "OriginUsageRecord.h" 35 35 … … 113 113 } 114 114 115 void OriginQuotaManager::markDatabase( AbstractDatabase* database)115 void OriginQuotaManager::markDatabase(DatabaseBackend* database) 116 116 { 117 117 ASSERT(database); -
trunk/Source/WebCore/Modules/webdatabase/OriginQuotaManager.h
r109877 r141207 39 39 namespace WebCore { 40 40 41 class AbstractDatabase;41 class DatabaseBackend; 42 42 class OriginUsageRecord; 43 43 … … 57 57 void removeOrigin(SecurityOrigin*); 58 58 59 void markDatabase( AbstractDatabase*); // Mark dirtiness of a specific database.59 void markDatabase(DatabaseBackend*); // Mark dirtiness of a specific database. 60 60 unsigned long long diskUsage(SecurityOrigin*) const; 61 61 -
trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.cpp
r139078 r141207 34 34 #if ENABLE(SQL_DATABASE) 35 35 36 #include " AbstractDatabase.h"36 #include "DatabaseBackend.h" 37 37 #include "DatabaseContext.h" 38 38 #include "DatabaseManager.h" … … 42 42 namespace WebCore { 43 43 44 void SQLTransactionClient::didCommitWriteTransaction( AbstractDatabase* database)44 void SQLTransactionClient::didCommitWriteTransaction(DatabaseBackend* database) 45 45 { 46 46 DatabaseManager::manager().scheduleNotifyDatabaseChanged( … … 48 48 } 49 49 50 void SQLTransactionClient::didExecuteStatement( AbstractDatabase* database)50 void SQLTransactionClient::didExecuteStatement(DatabaseBackend* database) 51 51 { 52 52 DatabaseManager::manager().databaseChanged(database); 53 53 } 54 54 55 bool SQLTransactionClient::didExceedQuota( AbstractDatabase* database)55 bool SQLTransactionClient::didExceedQuota(DatabaseBackend* database) 56 56 { 57 57 ASSERT(database->scriptExecutionContext()->isContextThread()); -
trunk/Source/WebCore/Modules/webdatabase/SQLTransactionClient.h
r109877 r141207 39 39 namespace WebCore { 40 40 41 class AbstractDatabase;41 class DatabaseBackend; 42 42 43 43 // A client to the SQLTransaction class. Allows SQLTransaction to notify interested … … 47 47 public: 48 48 SQLTransactionClient() { } 49 void didCommitWriteTransaction( AbstractDatabase*);50 void didExecuteStatement( AbstractDatabase*);51 bool didExceedQuota( AbstractDatabase*);49 void didCommitWriteTransaction(DatabaseBackend*); 50 void didExecuteStatement(DatabaseBackend*); 51 bool didExceedQuota(DatabaseBackend*); 52 52 }; 53 53 -
trunk/Source/WebCore/Modules/webdatabase/chromium/DatabaseObserver.h
r109877 r141207 38 38 namespace WebCore { 39 39 40 class AbstractDatabase;40 class DatabaseBackend; 41 41 class ScriptExecutionContext; 42 42 … … 46 46 public: 47 47 static bool canEstablishDatabase(ScriptExecutionContext*, const String&, const String&, unsigned long); 48 static void databaseOpened( AbstractDatabase*);49 static void databaseModified( AbstractDatabase*);50 static void databaseClosed( AbstractDatabase*);48 static void databaseOpened(DatabaseBackend*); 49 static void databaseModified(DatabaseBackend*); 50 static void databaseClosed(DatabaseBackend*); 51 51 52 static void reportOpenDatabaseResult( AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);53 static void reportChangeVersionResult( AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);54 static void reportStartTransactionResult( AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);55 static void reportCommitTransactionResult( AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);56 static void reportExecuteStatementResult( AbstractDatabase*, int callsite, int webSqlErrorCode, int sqliteErrorCode);57 static void reportVacuumDatabaseResult( AbstractDatabase*, int sqliteErrorCode);52 static void reportOpenDatabaseResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode); 53 static void reportChangeVersionResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode); 54 static void reportStartTransactionResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode); 55 static void reportCommitTransactionResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode); 56 static void reportExecuteStatementResult(DatabaseBackend*, int callsite, int webSqlErrorCode, int sqliteErrorCode); 57 static void reportVacuumDatabaseResult(DatabaseBackend*, int sqliteErrorCode); 58 58 }; 59 59 -
trunk/Source/WebCore/Modules/webdatabase/chromium/DatabaseTrackerChromium.cpp
r130612 r141207 34 34 #if ENABLE(SQL_DATABASE) 35 35 36 #include " AbstractDatabase.h"36 #include "DatabaseBackend.h" 37 37 #include "DatabaseObserver.h" 38 38 #include "QuotaTracker.h" … … 72 72 } 73 73 74 void DatabaseTracker::addOpenDatabase( AbstractDatabase* database)74 void DatabaseTracker::addOpenDatabase(DatabaseBackend* database) 75 75 { 76 76 ASSERT(database->scriptExecutionContext()->isContextThread()); … … 100 100 class NotifyDatabaseObserverOnCloseTask : public ScriptExecutionContext::Task { 101 101 public: 102 static PassOwnPtr<NotifyDatabaseObserverOnCloseTask> create(PassRefPtr< AbstractDatabase> database)102 static PassOwnPtr<NotifyDatabaseObserverOnCloseTask> create(PassRefPtr<DatabaseBackend> database) 103 103 { 104 104 return adoptPtr(new NotifyDatabaseObserverOnCloseTask(database)); … … 116 116 117 117 private: 118 NotifyDatabaseObserverOnCloseTask(PassRefPtr< AbstractDatabase> database)118 NotifyDatabaseObserverOnCloseTask(PassRefPtr<DatabaseBackend> database) 119 119 : m_database(database) 120 120 { 121 121 } 122 122 123 RefPtr< AbstractDatabase> m_database;123 RefPtr<DatabaseBackend> m_database; 124 124 }; 125 125 126 void DatabaseTracker::removeOpenDatabase( AbstractDatabase* database)126 void DatabaseTracker::removeOpenDatabase(DatabaseBackend* database) 127 127 { 128 128 String originIdentifier = database->securityOrigin()->databaseIdentifier(); … … 158 158 } 159 159 160 unsigned long long DatabaseTracker::getMaxSizeForDatabase(const AbstractDatabase* database)160 unsigned long long DatabaseTracker::getMaxSizeForDatabase(const DatabaseBackend* database) 161 161 { 162 162 unsigned long long spaceAvailable = 0; … … 192 192 class DatabaseTracker::CloseOneDatabaseImmediatelyTask : public ScriptExecutionContext::Task { 193 193 public: 194 static PassOwnPtr<CloseOneDatabaseImmediatelyTask> create(const String& originIdentifier, const String& name, AbstractDatabase* database)194 static PassOwnPtr<CloseOneDatabaseImmediatelyTask> create(const String& originIdentifier, const String& name, DatabaseBackend* database) 195 195 { 196 196 return adoptPtr(new CloseOneDatabaseImmediatelyTask(originIdentifier, name, database)); … … 203 203 204 204 private: 205 CloseOneDatabaseImmediatelyTask(const String& originIdentifier, const String& name, AbstractDatabase* database)205 CloseOneDatabaseImmediatelyTask(const String& originIdentifier, const String& name, DatabaseBackend* database) 206 206 : m_originIdentifier(originIdentifier.isolatedCopy()) 207 207 , m_name(name.isolatedCopy()) … … 212 212 String m_originIdentifier; 213 213 String m_name; 214 AbstractDatabase* m_database;// Intentionally a raw pointer.214 DatabaseBackend* m_database; // Intentionally a raw pointer. 215 215 }; 216 216 … … 235 235 } 236 236 237 void DatabaseTracker::closeOneDatabaseImmediately(const String& originIdentifier, const String& name, AbstractDatabase* database)237 void DatabaseTracker::closeOneDatabaseImmediately(const String& originIdentifier, const String& name, DatabaseBackend* database) 238 238 { 239 239 // First we have to confirm the 'database' is still in our collection. -
trunk/Source/WebCore/Modules/webdatabase/chromium/SQLTransactionClientChromium.cpp
r109877 r141207 34 34 #if ENABLE(SQL_DATABASE) 35 35 36 #include " AbstractDatabase.h"36 #include "DatabaseBackend.h" 37 37 #include "DatabaseObserver.h" 38 38 #include "ScriptExecutionContext.h" … … 42 42 class NotifyDatabaseChangedTask : public ScriptExecutionContext::Task { 43 43 public: 44 static PassOwnPtr<NotifyDatabaseChangedTask> create( AbstractDatabase*database)44 static PassOwnPtr<NotifyDatabaseChangedTask> create(DatabaseBackend *database) 45 45 { 46 46 return adoptPtr(new NotifyDatabaseChangedTask(database)); … … 53 53 54 54 private: 55 NotifyDatabaseChangedTask(PassRefPtr< AbstractDatabase> database)55 NotifyDatabaseChangedTask(PassRefPtr<DatabaseBackend> database) 56 56 : m_database(database) 57 57 { 58 58 } 59 59 60 RefPtr< AbstractDatabase> m_database;60 RefPtr<DatabaseBackend> m_database; 61 61 }; 62 62 63 void SQLTransactionClient::didCommitWriteTransaction( AbstractDatabase* database)63 void SQLTransactionClient::didCommitWriteTransaction(DatabaseBackend* database) 64 64 { 65 65 if (!database->scriptExecutionContext()->isContextThread()) { … … 71 71 } 72 72 73 void SQLTransactionClient::didExecuteStatement( AbstractDatabase* database)73 void SQLTransactionClient::didExecuteStatement(DatabaseBackend* database) 74 74 { 75 75 // This method is called after executing every statement that changes the DB. … … 77 77 } 78 78 79 bool SQLTransactionClient::didExceedQuota( AbstractDatabase* database)79 bool SQLTransactionClient::didExceedQuota(DatabaseBackend* database) 80 80 { 81 81 // Chromium does not allow users to manually change the quota for an origin (for now, at least). -
trunk/Source/WebCore/Target.pri
r141063 r141207 20 20 Modules/geolocation/NavigatorGeolocation.cpp \ 21 21 \ 22 Modules/webdatabase/AbstractDatabase.cpp \23 22 Modules/webdatabase/DOMWindowWebDatabase.cpp \ 24 23 Modules/webdatabase/Database.cpp \ 25 24 Modules/webdatabase/DatabaseAuthorizer.cpp \ 25 Modules/webdatabase/DatabaseBackend.cpp \ 26 26 Modules/webdatabase/DatabaseContext.cpp \ 27 27 Modules/webdatabase/DatabaseSync.cpp \ … … 1435 1435 Modules/proximity/DeviceProximityEvent.h \ 1436 1436 \ 1437 Modules/webdatabase/AbstractDatabase.h \1438 1437 Modules/webdatabase/AbstractDatabaseServer.h \ 1439 1438 Modules/webdatabase/ChangeVersionWrapper.h \ … … 1441 1440 Modules/webdatabase/DatabaseAuthorizer.h \ 1442 1441 Modules/webdatabase/Database.h \ 1442 Modules/webdatabase/DatabaseBackend.h \ 1443 1443 Modules/webdatabase/DatabaseCallback.h \ 1444 1444 Modules/webdatabase/DatabaseManager.h \ -
trunk/Source/WebCore/WebCore.gypi
r141063 r141207 995 995 'Modules/webaudio/WaveTable.cpp', 996 996 'Modules/webaudio/WaveTable.h', 997 'Modules/webdatabase/AbstractDatabase.cpp',998 997 'Modules/webdatabase/AbstractDatabaseServer.h', 999 998 'Modules/webdatabase/ChangeVersionWrapper.cpp', … … 1002 1001 'Modules/webdatabase/DatabaseAuthorizer.cpp', 1003 1002 'Modules/webdatabase/DatabaseAuthorizer.h', 1003 'Modules/webdatabase/DatabaseBackend.cpp', 1004 1004 'Modules/webdatabase/DatabaseCallback.h', 1005 1005 'Modules/webdatabase/DatabaseContext.cpp', -
trunk/Source/WebCore/WebCore.order
r140626 r141207 1441 1441 __ZN7WebCore8Settings25setMinimumLogicalFontSizeEi 1442 1442 __ZN7WebCore8Settings17setPluginsEnabledEb 1443 __ZN7WebCore1 6AbstractDatabase14setIsAvailableEb1443 __ZN7WebCore15DatabaseBackend14setIsAvailableEb 1444 1444 __ZN7WebCore8Settings25setPrivateBrowsingEnabledEb 1445 1445 __ZN7WebCore8Settings22setSansSerifFontFamilyERKN3WTF12AtomicStringE … … 25527 25527 __ZN7WebCore40jsDOMWindowPrototypeFunctionOpenDatabaseEPN3JSC9ExecStateE 25528 25528 __ZN7WebCore9DOMWindow12openDatabaseERKN3WTF6StringES4_S4_mNS1_10PassRefPtrINS_16DatabaseCallbackEEERi 25529 __ZN7WebCore1 6AbstractDatabase11isAvailableEv25529 __ZN7WebCore15DatabaseBackend11isAvailableEv 25530 25530 __ZN7WebCore4toJSEPN3JSC9ExecStateEPNS_17JSDOMGlobalObjectEPNS_8DatabaseE 25531 25531 __ZN7WebCore8Database12openDatabaseEPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_mNS3_10PassRefPtrINS_16DatabaseCallbackEEERi … … 25563 25563 __ZNK3WTF9HashTableIPSt4pairINS_6RefPtrIN7WebCore14SecurityOriginEEENS3_15DatabaseDetailsEES8_NS_17IdentityExtractorIS8_EENS_7PtrHashIS8_EENS_10HashTraitsIS8_EESE_E4findIS8_NS_22IdentityHashTranslatorIS8_S8_SC_EEEENS_22HashTableConstIteratorIS8_S8_SA_SC_SE_SE_EERKT_ 25564 25564 __ZN7WebCore8DatabaseC2EPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_m 25565 __ZN7WebCore1 6AbstractDatabaseC2EPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_m25565 __ZN7WebCore15DatabaseBackendC2EPNS_22ScriptExecutionContextERKN3WTF6StringES6_S6_m 25566 25566 __ZN7WebCore18DatabaseAuthorizer6createERKN3WTF6StringE 25567 25567 __ZN7WebCore18DatabaseAuthorizer23addWhitelistedFunctionsEv … … 25571 25571 __ZN3WTF9HashTableINS_6StringESt4pairIS1_iENS_18PairFirstExtractorIS3_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENS8_IiEEEES9_E6lookupIS1_NS_22IdentityHashTranslatorIS1_S3_S6_EEEEPS3_RKT_ 25572 25572 __ZN3WTF9HashTableINS_6StringESt4pairIS1_iENS_18PairFirstExtractorIS3_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENS8_IiEEEES9_E6rehashEi 25573 __ZNK3WTF7HashMapIiPNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_7PtrHashIS4_EENS_10HashTraitsIS4_EEEENS_7IntHashIjEENS7_IiEENS7_ISA_EEE3getERKi25574 __ZN3WTF9HashTableIPN7WebCore1 6AbstractDatabaseES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E3addIS3_S3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEESt4pairINS_17HashTableIteratorIS3_S3_S5_S7_S9_S9_EEbERKT_RKT0_25575 __ZN3WTF9HashTableIPN7WebCore1 6AbstractDatabaseES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6expandEv25573 __ZNK3WTF7HashMapIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS4_EENS_10HashTraitsIS4_EEEENS_7IntHashIjEENS7_IiEENS7_ISA_EEE3getERKi 25574 __ZN3WTF9HashTableIPN7WebCore15DatabaseBackendES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E3addIS3_S3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEESt4pairINS_17HashTableIteratorIS3_S3_S5_S7_S9_S9_EEbERKT_RKT0_ 25575 __ZN3WTF9HashTableIPN7WebCore15DatabaseBackendES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6expandEv 25576 25576 __ZN7WebCore15DatabaseTracker19fullPathForDatabaseEPNS_14SecurityOriginERKN3WTF6StringEb 25577 25577 __ZN7WebCore15DatabaseTracker25fullPathForDatabaseNoLockEPNS_14SecurityOriginERKN3WTF6StringEb … … 25584 25584 __ZN3WTF7HashMapINS_6StringEN7WebCore17OriginUsageRecord13DatabaseEntryENS_10StringHashENS_10HashTraitsIS1_EENS6_IS4_EEE3setERKS1_RKS4_ 25585 25585 __ZN3WTF17HashMapTranslatorISt4pairINS_6StringEN7WebCore17OriginUsageRecord13DatabaseEntryEENS_14PairHashTraitsINS_10HashTraitsIS2_EENS8_IS5_EEEENS_10StringHashEE9translateERS6_RKS2_RKS5_ 25586 __ZN7WebCore15DatabaseTracker15addOpenDatabaseEPNS_1 6AbstractDatabaseE25587 __ZN3WTF10PassOwnPtrINS_7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEEPNS1_INS_6StringEPNS_7HashSetIPNS3_1 6AbstractDatabaseENS_7PtrHashIS9_EENS_10HashTraitsIS9_EEEENS_10StringHashENSC_IS6_EENSC_ISF_EEEENS3_18SecurityOriginHashENSC_IS5_EENSC_ISK_EEEEED1Ev25588 __ZNK7WebCore1 6AbstractDatabase16stringIdentifierEv25589 __ZNK7WebCore1 6AbstractDatabase14securityOriginEv25590 __ZNK3WTF7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEEPNS0_INS_6StringEPNS_7HashSetIPNS2_1 6AbstractDatabaseENS_7PtrHashIS8_EENS_10HashTraitsIS8_EEEENS_10StringHashENSB_IS5_EENSB_ISE_EEEENS2_18SecurityOriginHashENSB_IS4_EENSB_ISJ_EEE3getEPS3_25591 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E16lookupForWritingIS1_NS_22IdentityHashTranslatorIS1_SD_SG_EEEES2_IPSD_bERKT_25592 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_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_25593 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6lookupIS1_NS_22IdentityHashTranslatorIS1_SD_SG_EEEEPSD_RKT_25594 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6rehashEi25595 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6removeEPSD_25586 __ZN7WebCore15DatabaseTracker15addOpenDatabaseEPNS_15DatabaseBackendE 25587 __ZN3WTF10PassOwnPtrINS_7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEEPNS1_INS_6StringEPNS_7HashSetIPNS3_15DatabaseBackendENS_7PtrHashIS9_EENS_10HashTraitsIS9_EEEENS_10StringHashENSC_IS6_EENSC_ISF_EEEENS3_18SecurityOriginHashENSC_IS5_EENSC_ISK_EEEEED1Ev 25588 __ZNK7WebCore15DatabaseBackend16stringIdentifierEv 25589 __ZNK7WebCore15DatabaseBackend14securityOriginEv 25590 __ZNK3WTF7HashMapINS_6RefPtrIN7WebCore14SecurityOriginEEEPNS0_INS_6StringEPNS_7HashSetIPNS2_15DatabaseBackendENS_7PtrHashIS8_EENS_10HashTraitsIS8_EEEENS_10StringHashENSB_IS5_EENSB_ISE_EEEENS2_18SecurityOriginHashENSB_IS4_EENSB_ISJ_EEE3getEPS3_ 25591 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E16lookupForWritingIS1_NS_22IdentityHashTranslatorIS1_SD_SG_EEEES2_IPSD_bERKT_ 25592 __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_ 25593 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6lookupIS1_NS_22IdentityHashTranslatorIS1_SD_SG_EEEEPSD_RKT_ 25594 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6rehashEi 25595 __ZN3WTF9HashTableINS_6StringESt4pairIS1_PNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS6_EENS_10HashTraitsIS6_EEEEENS_18PairFirstExtractorISD_EENS_10StringHashENS_14PairHashTraitsINS9_IS1_EENS9_ISC_EEEESI_E6removeEPSD_ 25596 25596 __ZN7WebCore15DatabaseTracker20doneCreatingDatabaseEPNS_14SecurityOriginERKN3WTF6StringE 25597 25597 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringElNS_10StringHashENS_10HashTraitsIS7_EENS9_IlEEEEENS_18PairFirstExtractorISE_EENS2_18SecurityOriginHashENS_14PairHashTraitsINS9_IS4_EENS9_ISD_EEEESJ_E16lookupForWritingERKS4_ … … 25616 25616 __ZN3WTF12MessageQueueIN7WebCore12DatabaseTaskEE19alwaysTruePredicateEPS2_ 25617 25617 __ZN7WebCore12DatabaseTask11performTaskEv 25618 __ZN7WebCore1 6AbstractDatabase15resetAuthorizerEv25618 __ZN7WebCore15DatabaseBackend15resetAuthorizerEv 25619 25619 __ZN7WebCore18DatabaseAuthorizer5resetEv 25620 25620 __ZN7WebCore8Database16DatabaseOpenTask13doPerformTaskEv 25621 25621 __ZN7WebCore8Database20performOpenAndVerifyEbRi 25622 __ZN7WebCore1 6AbstractDatabase20performOpenAndVerifyEbRi25622 __ZN7WebCore15DatabaseBackend20performOpenAndVerifyEbRi 25623 25623 __ZN7WebCore14SQLiteDatabase27turnOnIncrementalAutoVacuumEv 25624 25624 __ZN7WebCore14SQLiteDatabase13setAuthorizerEN3WTF10PassRefPtrINS_18DatabaseAuthorizerEEE … … 25635 25635 __ZN7WebCore18DatabaseAuthorizer11createIndexERKN3WTF6StringES4_ 25636 25636 __ZN7WebCore18DatabaseAuthorizer11allowUpdateERKN3WTF6StringES4_ 25637 __ZN7WebCore1 6AbstractDatabase22getVersionFromDatabaseERN3WTF6StringE25637 __ZN7WebCore15DatabaseBackend22getVersionFromDatabaseERN3WTF6StringE 25638 25638 __ZN7WebCore18DatabaseAuthorizer7disableEv 25639 25639 __ZN7WebCore18DatabaseAuthorizer6enableEv 25640 __ZN7WebCore1 6AbstractDatabase20setVersionInDatabaseERKN3WTF6StringE25640 __ZN7WebCore15DatabaseBackend20setVersionInDatabaseERKN3WTF6StringE 25641 25641 __ZN7WebCoreL20updateGuidVersionMapEiN3WTF6StringE 25642 25642 __ZN7WebCore14DatabaseThread18recordDatabaseOpenEPNS_8DatabaseE … … 25649 25649 __ZN7WebCore24InspectorInstrumentation19didOpenDatabaseImplEPNS_19InstrumentingAgentsEN3WTF10PassRefPtrINS_8DatabaseEEERKNS3_6StringES9_S9_ 25650 25650 __ZN7WebCore22InspectorDatabaseAgent15didOpenDatabaseEN3WTF10PassRefPtrINS_8DatabaseEEERKNS1_6StringES7_S7_ 25651 __ZNK7WebCore1 6AbstractDatabase8fileNameEv25651 __ZNK7WebCore15DatabaseBackend8fileNameEv 25652 25652 __ZN7WebCore22InspectorDatabaseAgent14findByFileNameERKN3WTF6StringE 25653 25653 __ZN7WebCore25InspectorDatabaseResource6createEN3WTF10PassRefPtrINS_8DatabaseEEERKNS1_6StringES7_S7_ … … 25666 25666 __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore25SQLTransactionCoordinator16CoordinationInfoEENS_18PairFirstExtractorIS6_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENSB_IS5_EEEESC_E6rehashEi 25667 25667 __ZN7WebCore8Database5closeEv 25668 __ZN7WebCore1 6AbstractDatabase13closeDatabaseEv25669 __ZNK3WTF9HashTableIPN7WebCore1 6AbstractDatabaseES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E4findIS3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEENS_22HashTableConstIteratorIS3_S3_S5_S7_S9_S9_EERKT_25670 __ZN3WTF9HashTableIPN7WebCore1 6AbstractDatabaseES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6removeEPS3_25671 __ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E16lookupForWritingERKi25672 __ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_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_25673 __ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E4findIiNS_22IdentityHashTranslatorIiSC_SG_EEEENS_17HashTableIteratorIiSC_SE_SG_SK_SI_EERKT_25674 __ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore1 6AbstractDatabaseENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E6rehashEi25668 __ZN7WebCore15DatabaseBackend13closeDatabaseEv 25669 __ZNK3WTF9HashTableIPN7WebCore15DatabaseBackendES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E4findIS3_NS_22IdentityHashTranslatorIS3_S3_S7_EEEENS_22HashTableConstIteratorIS3_S3_S5_S7_S9_S9_EERKT_ 25670 __ZN3WTF9HashTableIPN7WebCore15DatabaseBackendES3_NS_17IdentityExtractorIS3_EENS_7PtrHashIS3_EENS_10HashTraitsIS3_EES9_E6removeEPS3_ 25671 __ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E16lookupForWritingERKi 25672 __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_ 25673 __ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E4findIiNS_22IdentityHashTranslatorIiSC_SG_EEEENS_17HashTableIteratorIiSC_SE_SG_SK_SI_EERKT_ 25674 __ZN3WTF9HashTableIiSt4pairIiPNS_7HashSetIPN7WebCore15DatabaseBackendENS_7PtrHashIS5_EENS_10HashTraitsIS5_EEEEENS_18PairFirstExtractorISC_EENS_7IntHashIjEENS_14PairHashTraitsINS8_IiEENS8_ISB_EEEESI_E6rehashEi 25675 25675 __ZN7WebCore14DatabaseThread20recordDatabaseClosedEPNS_8DatabaseE 25676 25676 __ZNK3WTF9HashTableINS_6RefPtrIN7WebCore8DatabaseEEES4_NS_17IdentityExtractorIS4_EENS_7PtrHashIS4_EENS_10HashTraitsIS4_EESA_E4findIS4_NS_22IdentityHashTranslatorIS4_S4_S8_EEEENS_22HashTableConstIteratorIS4_S4_S6_S8_SA_SA_EERKT_ 25677 25677 __ZN7WebCore14DatabaseThread23unscheduleDatabaseTasksEPNS_8DatabaseE 25678 25678 __ZN3WTF12MessageQueueIN7WebCore12DatabaseTaskEE8removeIfINS1_21SameDatabasePredicateEEEvRT_ 25679 __ZN7WebCore15DatabaseTracker18removeOpenDatabaseEPNS_1 6AbstractDatabaseE25679 __ZN7WebCore15DatabaseTracker18removeOpenDatabaseEPNS_15DatabaseBackendE 25680 25680 __ZNK7WebCore8Database14securityOriginEv 25681 25681 __ZThn208_NK7WebCore8Document15isContextThreadEv 25682 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_1 6AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E16lookupForWritingERKS4_25683 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_1 6AbstractDatabaseENS_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_25684 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_1 6AbstractDatabaseENS_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_25685 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_1 6AbstractDatabaseENS_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_25686 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_1 6AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E6rehashEi25687 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS_7HashMapINS_6StringEPNS_7HashSetIPNS2_1 6AbstractDatabaseENS_7PtrHashISA_EENS_10HashTraitsISA_EEEENS_10StringHashENSD_IS7_EENSD_ISG_EEEEENS_18PairFirstExtractorISM_EENS2_18SecurityOriginHashENS_14PairHashTraitsINSD_IS4_EENSD_ISL_EEEESR_E6removeEPSM_25682 __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_ 25683 __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_ 25684 __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_ 25685 __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_ 25686 __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 25687 __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_ 25688 25688 __ZN7WebCore18OriginQuotaManager12removeOriginEPNS_14SecurityOriginE 25689 25689 __ZN3WTF9HashTableINS_6RefPtrIN7WebCore14SecurityOriginEEESt4pairIS4_PNS2_17OriginUsageRecordEENS_18PairFirstExtractorIS8_EENS2_18SecurityOriginHashENS_14PairHashTraitsINS_10HashTraitsIS4_EENSD_IS7_EEEESE_E16lookupForWritingERKS4_ … … 25698 25698 __ZN7WebCore8DatabaseD0Ev 25699 25699 __ZN3WTF5DequeINS_6RefPtrIN7WebCore14SQLTransactionEEELm0EE10destroyAllEv 25700 __ZN7WebCore1 6AbstractDatabaseD2Ev25700 __ZN7WebCore15DatabaseBackendD2Ev 25701 25701 __ZN7WebCore14SQLiteDatabaseD1Ev 25702 25702 __ZN7WebCore18DatabaseAuthorizerD1Ev … … 25883 25883 __ZN7WebCore14SQLTransaction6createEPNS_8DatabaseEN3WTF10PassRefPtrINS_22SQLTransactionCallbackEEENS4_INS_27SQLTransactionErrorCallbackEEENS4_INS_12VoidCallbackEEENS4_INS_21SQLTransactionWrapperEEEb 25884 25884 __ZN7WebCore14SQLTransactionC2EPNS_8DatabaseEN3WTF10PassRefPtrINS_22SQLTransactionCallbackEEENS4_INS_27SQLTransactionErrorCallbackEEENS4_INS_12VoidCallbackEEENS4_INS_21SQLTransactionWrapperEEEb 25885 __ZNK7WebCore1 6AbstractDatabase22scriptExecutionContextEv25885 __ZNK7WebCore15DatabaseBackend22scriptExecutionContextEv 25886 25886 __ZN3WTF5DequeINS_6RefPtrIN7WebCore14SQLTransactionEEELm0EE14expandCapacityEv 25887 25887 __ZN7WebCore8Database19scheduleTransactionEv … … 25891 25891 __ZN7WebCore14SQLTransaction15performNextStepEv 25892 25892 __ZN7WebCore14SQLTransaction41checkAndHandleClosedOrInterruptedDatabaseEv 25893 __ZN7WebCore1 6AbstractDatabase13isInterruptedEv25893 __ZN7WebCore15DatabaseBackend13isInterruptedEv 25894 25894 __ZN7WebCore14SQLTransaction11acquireLockEv 25895 25895 __ZNK7WebCore8Database22transactionCoordinatorEv … … 25905 25905 __ZN7WebCore14SQLTransaction27openTransactionAndPreflightEv 25906 25906 __ZNK7WebCore8Database11maximumSizeEv 25907 __ZN7WebCore15DatabaseTracker21getMaxSizeForDatabaseEPKNS_1 6AbstractDatabaseE25907 __ZN7WebCore15DatabaseTracker21getMaxSizeForDatabaseEPKNS_15DatabaseBackendE 25908 25908 __ZN3WTF9HashTableINS_6StringESt4pairIS1_N7WebCore17OriginUsageRecord13DatabaseEntryEENS_18PairFirstExtractorIS6_EENS_10StringHashENS_14PairHashTraitsINS_10HashTraitsIS1_EENSB_IS5_EEEESC_E16lookupForWritingIS1_NS_22IdentityHashTranslatorIS1_S6_S9_EEEES2_IPS6_bERKT_ 25909 25909 __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_ … … 25913 25913 __ZN7WebCore14SQLiteDatabase14setMaximumSizeEx 25914 25914 __ZN7WebCore14SQLiteDatabase8pageSizeEv 25915 __ZN7WebCore1 6AbstractDatabase12resetDeletesEv25915 __ZN7WebCore15DatabaseBackend12resetDeletesEv 25916 25916 __ZN7WebCore18DatabaseAuthorizer12resetDeletesEv 25917 __ZN7WebCore1 6AbstractDatabase17disableAuthorizerEv25917 __ZN7WebCore15DatabaseBackend17disableAuthorizerEv 25918 25918 __ZN7WebCore18DatabaseAuthorizer16allowTransactionEv 25919 __ZN7WebCore1 6AbstractDatabase16enableAuthorizerEv25919 __ZN7WebCore15DatabaseBackend16enableAuthorizerEv 25920 25920 __ZN7WebCore8Database27scheduleTransactionCallbackEPNS_14SQLTransactionE 25921 25921 __ZN7WebCore26DeliverPendingCallbackTask11performTaskEPNS_22ScriptExecutionContextE … … 25950 25950 __ZN7WebCore12SQLStatementC2EPNS_8DatabaseERKN3WTF6StringERKNS3_6VectorINS_8SQLValueELm0EEENS3_10PassRefPtrINS_20SQLStatementCallbackEEENSC_INS_25SQLStatementErrorCallbackEEEi 25951 25951 __ZN3WTF6VectorIN7WebCore8SQLValueELm0EEC2ERKS3_ 25952 __ZNK7WebCore1 6AbstractDatabase22versionMatchesExpectedEv25952 __ZNK7WebCore15DatabaseBackend22versionMatchesExpectedEv 25953 25953 __ZNK3WTF7HashMapIiNS_6StringENS_7IntHashIjEENS_10HashTraitsIiEENS4_IS1_EEE3getERKi 25954 25954 __ZN7WebCore14SQLTransaction16enqueueStatementEN3WTF10PassRefPtrINS_12SQLStatementEEE … … 25959 25959 __ZN7WebCore12SQLStatement7executeEPNS_8DatabaseE 25960 25960 __ZN7WebCore12SQLStatement22clearFailureDueToQuotaEv 25961 __ZN7WebCore1 6AbstractDatabase24setAuthorizerPermissionsEi25961 __ZN7WebCore15DatabaseBackend24setAuthorizerPermissionsEi 25962 25962 __ZN7WebCore18DatabaseAuthorizer14setPermissionsEi 25963 25963 __ZN7WebCore14SQLiteDatabase12lastErrorMsgEv … … 26513 26513 __ZN3JSC18getStaticValueSlotIN7WebCore14JSDatabaseSyncENS1_12JSDOMWrapperEEEbPNS_9ExecStateEPKNS_9HashTableEPT_RKNS_10IdentifierERNS_12PropertySlotE 26514 26514 __ZN7WebCore21jsDatabaseSyncVersionEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE 26515 __ZNK7WebCore1 6AbstractDatabase7versionEv26515 __ZNK7WebCore15DatabaseBackend7versionEv 26516 26516 __ZN7WebCore23JSDatabaseSyncPrototype18getOwnPropertySlotEPN3JSC9ExecStateERKNS1_10IdentifierERNS1_12PropertySlotE 26517 26517 __ZN7WebCore44jsDatabaseSyncPrototypeFunctionChangeVersionEPN3JSC9ExecStateE … … 26520 26520 __ZN7WebCore18SQLTransactionSync6createEPNS_12DatabaseSyncEN3WTF10PassRefPtrINS_26SQLTransactionSyncCallbackEEEb 26521 26521 __ZN7WebCore18SQLTransactionSync5beginEv 26522 __ZNK7WebCore1 6AbstractDatabase11maximumSizeEv26522 __ZNK7WebCore15DatabaseBackend11maximumSizeEv 26523 26523 __ZN7WebCore18SQLTransactionSync7executeEv 26524 26524 __ZN7WebCore28JSSQLTransactionSyncCallback11handleEventEPNS_18SQLTransactionSyncE … … 26528 26528 __ZN7WebCore20JSSQLTransactionSync15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE 26529 26529 __ZN7WebCore18SQLTransactionSync6commitEv 26530 __ZN7WebCore1 6AbstractDatabase10hadDeletesEv26531 __ZN7WebCore1 6AbstractDatabase18setExpectedVersionERKN3WTF6StringE26530 __ZN7WebCore15DatabaseBackend10hadDeletesEv 26531 __ZN7WebCore15DatabaseBackend18setExpectedVersionERKN3WTF6StringE 26532 26532 __ZN7WebCore28JSSQLTransactionSyncCallbackD0Ev 26533 26533 __ZNK7WebCore13WorkerContext15isContextThreadEv … … 26544 26544 __ZNK7WebCore15SQLiteStatement18bindParameterCountEv 26545 26545 __ZN7WebCore12SQLResultSetC1Ev 26546 __ZN7WebCore1 6AbstractDatabase19lastActionWasInsertEv26546 __ZN7WebCore15DatabaseBackend19lastActionWasInsertEv 26547 26547 __ZN7WebCore12SQLResultSet11setInsertIdEx 26548 26548 __ZN7WebCore14SQLiteDatabase11lastChangesEv 26549 26549 __ZN7WebCore12SQLResultSet15setRowsAffectedEi 26550 __ZN7WebCore1 6AbstractDatabase25lastActionChangedDatabaseEv26551 __ZN7WebCore20SQLTransactionClient19didExecuteStatementEPNS_1 6AbstractDatabaseE26552 __ZN7WebCore15DatabaseTracker15databaseChangedEPNS_1 6AbstractDatabaseE26553 __ZN7WebCore18OriginQuotaManager12markDatabaseEPNS_1 6AbstractDatabaseE26550 __ZN7WebCore15DatabaseBackend25lastActionChangedDatabaseEv 26551 __ZN7WebCore20SQLTransactionClient19didExecuteStatementEPNS_15DatabaseBackendE 26552 __ZN7WebCore15DatabaseTracker15databaseChangedEPNS_15DatabaseBackendE 26553 __ZN7WebCore18OriginQuotaManager12markDatabaseEPNS_15DatabaseBackendE 26554 26554 __ZN7WebCore17OriginUsageRecord12markDatabaseERKN3WTF6StringE 26555 26555 __ZN7WebCore16SQLStatementSyncD1Ev … … 26558 26558 __ZN7WebCore15getDOMStructureINS_14JSSQLResultSetEEEPN3JSC9StructureEPNS2_9ExecStateEPNS_17JSDOMGlobalObjectE 26559 26559 __ZN7WebCore14JSSQLResultSet15createPrototypeEPN3JSC9ExecStateEPNS1_14JSGlobalObjectE 26560 __ZN7WebCore20SQLTransactionClient25didCommitWriteTransactionEPNS_1 6AbstractDatabaseE26560 __ZN7WebCore20SQLTransactionClient25didCommitWriteTransactionEPNS_15DatabaseBackendE 26561 26561 __ZN7WebCore15DatabaseTracker29scheduleNotifyDatabaseChangedEPNS_14SecurityOriginERKN3WTF6StringE 26562 26562 __ZN3WTF6VectorISt4pairINS_6RefPtrIN7WebCore14SecurityOriginEEENS_6StringEELm0EE14expandCapacityEm 26563 26563 __ZNSt4pairIN3WTF6RefPtrIN7WebCore14SecurityOriginEEENS0_6StringEED1Ev 26564 26564 __ZN7WebCore15DatabaseTracker22notifyDatabasesChangedEPv 26565 __ZN3WTF6VectorINS_6RefPtrIN7WebCore1 6AbstractDatabaseEEELm0EE14expandCapacityEm26566 __ZN7WebCore1 6AbstractDatabase9interruptEv26565 __ZN3WTF6VectorINS_6RefPtrIN7WebCore15DatabaseBackendEEELm0EE14expandCapacityEm 26566 __ZN7WebCore15DatabaseBackend9interruptEv 26567 26567 __ZN7WebCore14SQLiteDatabase9interruptEv 26568 26568 __ZN7WebCore14JSDatabaseSyncD1Ev … … 26709 26709 __ZN7WebCore18DatabaseAuthorizer11dropTriggerERKN3WTF6StringES4_ 26710 26710 __ZN7WebCore18DatabaseAuthorizer8dropViewERKN3WTF6StringE 26711 __ZN7WebCore1 6AbstractDatabase25incrementalVacuumIfNeededEv26711 __ZN7WebCore15DatabaseBackend25incrementalVacuumIfNeededEv 26712 26712 __ZN7WebCore14SQLiteDatabase13freeSpaceSizeEv 26713 26713 __ZN7WebCore14SQLiteDatabase9totalSizeEv … … 28596 28596 __ZN7WebCore12SQLStatement20setFailureDueToQuotaEv 28597 28597 __ZN7WebCore14SQLTransaction28deliverQuotaIncreaseCallbackEv 28598 __ZN7WebCore20SQLTransactionClient14didExceedQuotaEPNS_1 6AbstractDatabaseE28598 __ZN7WebCore20SQLTransactionClient14didExceedQuotaEPNS_15DatabaseBackendE 28599 28599 __ZN7WebCore15DatabaseTracker14quotaForOriginEPNS_14SecurityOriginE 28600 28600 __ZN7WebCore14jsSQLErrorCodeEPN3JSC9ExecStateENS0_7JSValueERKNS0_10IdentifierE … … 32523 32523 _OBJC_METACLASS_$_WebCoreTextFieldCell 32524 32524 __ZTVN7WebCore23InspectorLayerTreeAgentE 32525 __ZTVN7WebCore1 6AbstractDatabaseE32525 __ZTVN7WebCore15DatabaseBackendE 32526 32526 __ZTVN7WebCore14AbstractWorkerE 32527 32527 __ZTVN7WebCore21AccessibilityARIAGridE -
trunk/Source/WebCore/WebCore.vcproj/WebCore.vcproj
r141063 r141207 25370 25370 > 25371 25371 <File 25372 RelativePath="..\Modules\webdatabase\AbstractDatabase.cpp"25373 >25374 </File>25375 <File25376 RelativePath="..\Modules\webdatabase\AbstractDatabase.h"25377 >25378 </File>25379 <File25380 25372 RelativePath="..\Modules\webdatabase\AbstractDatabaseServer.h" 25381 25373 > … … 25403 25395 <File 25404 25396 RelativePath="..\Modules\webdatabase\DatabaseAuthorizer.h" 25397 > 25398 </File> 25399 <File 25400 RelativePath="..\Modules\webdatabase\DatabaseBackend.cpp" 25401 > 25402 </File> 25403 <File 25404 RelativePath="..\Modules\webdatabase\DatabaseBackend.h" 25405 25405 > 25406 25406 </File> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
r141179 r141207 1854 1854 <ClCompile Include="..\Modules\notifications\NotificationCenter.cpp" /> 1855 1855 <ClCompile Include="..\Modules\notifications\WorkerContextNotifications.cpp" /> 1856 <ClCompile Include="..\Modules\webdatabase\AbstractDatabase.cpp" />1857 1856 <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp" /> 1858 1857 <ClCompile Include="..\Modules\webdatabase\Database.cpp" /> 1859 1858 <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp" /> 1859 <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp" /> 1860 1860 <ClCompile Include="..\Modules\webdatabase\DatabaseContext.cpp" /> 1861 1861 <ClCompile Include="..\Modules\webdatabase\DatabaseManager.cpp" /> … … 6400 6400 <ClInclude Include="..\Modules\notifications\NotificationClient.h" /> 6401 6401 <ClInclude Include="..\Modules\notifications\WorkerContextNotifications.h" /> 6402 <ClInclude Include="..\Modules\webdatabase\AbstractDatabase.h" />6403 6402 <ClInclude Include="..\Modules\webdatabase\AbstractDatabaseServer.h" /> 6404 6403 <ClInclude Include="..\Modules\webdatabase\ChangeVersionWrapper.h" /> 6405 6404 <ClInclude Include="..\Modules\webdatabase\Database.h" /> 6406 6405 <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h" /> 6406 <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h" /> 6407 6407 <ClInclude Include="..\Modules\webdatabase\DatabaseCallback.h" /> 6408 6408 <ClInclude Include="..\Modules\webdatabase\DatabaseContext.h" /> -
trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
r141179 r141207 1828 1828 <Filter>Modules\notifications</Filter> 1829 1829 </ClCompile> 1830 <ClCompile Include="..\Modules\webdatabase\AbstractDatabase.cpp">1831 <Filter>Modules\webdatabase</Filter>1832 </ClCompile>1833 1830 <ClCompile Include="..\Modules\webdatabase\ChangeVersionWrapper.cpp"> 1834 1831 <Filter>Modules\webdatabase</Filter> … … 1838 1835 </ClCompile> 1839 1836 <ClCompile Include="..\Modules\webdatabase\DatabaseAuthorizer.cpp"> 1837 <Filter>Modules\webdatabase</Filter> 1838 </ClCompile> 1839 <ClCompile Include="..\Modules\webdatabase\DatabaseBackend.cpp"> 1840 1840 <Filter>Modules\webdatabase</Filter> 1841 1841 </ClCompile> … … 8433 8433 <Filter>Modules\notifications</Filter> 8434 8434 </ClInclude> 8435 <ClInclude Include="..\Modules\webdatabase\AbstractDatabase.h">8436 <Filter>Modules\webdatabase</Filter>8437 </ClInclude>8438 8435 <ClInclude Include="..\Modules\webdatabase\AbstractDatabaseServer.h"> 8439 8436 <Filter>Modules\webdatabase</Filter> … … 8446 8443 </ClInclude> 8447 8444 <ClInclude Include="..\Modules\webdatabase\DatabaseAuthorizer.h"> 8445 <Filter>Modules\webdatabase</Filter> 8446 </ClInclude> 8447 <ClInclude Include="..\Modules\webdatabase\DatabaseBackend.h"> 8448 8448 <Filter>Modules\webdatabase</Filter> 8449 8449 </ClInclude> -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r141063 r141207 3690 3690 97B38E28151C4273004622E9 /* DOMWindowNotifications.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97B38E23151C4264004622E9 /* DOMWindowNotifications.cpp */; }; 3691 3691 97B8FFD116AE7F960038388D /* CharacterReferenceParserInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = 97B8FFCF16AE7F920038388D /* CharacterReferenceParserInlines.h */; }; 3692 97BC69DA1505F076001B74AC /* AbstractDatabase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69D61505F076001B74AC /* AbstractDatabase.cpp */; };3693 97BC69DB1505F076001B74AC /* AbstractDatabase.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69D71505F076001B74AC /* AbstractDatabase.h */; settings = {ATTRIBUTES = (Private, ); }; };3694 3692 97BC69DC1505F076001B74AC /* ChangeVersionWrapper.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */; }; 3695 3693 97BC69DD1505F076001B74AC /* ChangeVersionWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69D91505F076001B74AC /* ChangeVersionWrapper.h */; }; … … 3698 3696 97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */; }; 3699 3697 97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */; }; 3698 97BC69DA1505F076001B74AC /* DatabaseBackend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69D61505F076001B74AC /* DatabaseBackend.cpp */; }; 3699 97BC69DB1505F076001B74AC /* DatabaseBackend.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69D71505F076001B74AC /* DatabaseBackend.h */; settings = {ATTRIBUTES = (Private, ); }; }; 3700 3700 97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */ = {isa = PBXBuildFile; fileRef = 97BC69E31505F081001B74AC /* DatabaseCallback.h */; }; 3701 3701 97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 97BC69E51505F081001B74AC /* DatabaseContext.cpp */; }; … … 11091 11091 97B38E25151C4264004622E9 /* DOMWindowNotifications.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DOMWindowNotifications.idl; path = Modules/notifications/DOMWindowNotifications.idl; sourceTree = "<group>"; }; 11092 11092 97B8FFCF16AE7F920038388D /* CharacterReferenceParserInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CharacterReferenceParserInlines.h; sourceTree = "<group>"; }; 11093 97BC69D61505F076001B74AC /* AbstractDatabase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AbstractDatabase.cpp; path = Modules/webdatabase/AbstractDatabase.cpp; sourceTree = "<group>"; };11094 97BC69D71505F076001B74AC /* AbstractDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AbstractDatabase.h; path = Modules/webdatabase/AbstractDatabase.h; sourceTree = "<group>"; };11095 11093 97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ChangeVersionWrapper.cpp; path = Modules/webdatabase/ChangeVersionWrapper.cpp; sourceTree = "<group>"; }; 11096 11094 97BC69D91505F076001B74AC /* ChangeVersionWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ChangeVersionWrapper.h; path = Modules/webdatabase/ChangeVersionWrapper.h; sourceTree = "<group>"; }; … … 11100 11098 97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseAuthorizer.cpp; path = Modules/webdatabase/DatabaseAuthorizer.cpp; sourceTree = "<group>"; }; 11101 11099 97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseAuthorizer.h; path = Modules/webdatabase/DatabaseAuthorizer.h; sourceTree = "<group>"; }; 11100 97BC69D61505F076001B74AC /* DatabaseBackend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DatabaseBackend.cpp; path = Modules/webdatabase/DatabaseBackend.cpp; sourceTree = "<group>"; }; 11101 97BC69D71505F076001B74AC /* DatabaseBackend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseBackend.h; path = Modules/webdatabase/DatabaseBackend.h; sourceTree = "<group>"; }; 11102 11102 97BC69E31505F081001B74AC /* DatabaseCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DatabaseCallback.h; path = Modules/webdatabase/DatabaseCallback.h; sourceTree = "<group>"; }; 11103 11103 97BC69E41505F081001B74AC /* DatabaseCallback.idl */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = DatabaseCallback.idl; path = Modules/webdatabase/DatabaseCallback.idl; sourceTree = "<group>"; }; … … 18494 18494 isa = PBXGroup; 18495 18495 children = ( 18496 97BC69D61505F076001B74AC /* AbstractDatabase.cpp */,18497 97BC69D71505F076001B74AC /* AbstractDatabase.h */,18498 18496 FE115FA9167988CD00249134 /* AbstractDatabaseServer.h */, 18499 18497 97BC69D81505F076001B74AC /* ChangeVersionWrapper.cpp */, … … 18504 18502 97BC69E11505F081001B74AC /* DatabaseAuthorizer.cpp */, 18505 18503 97BC69E21505F081001B74AC /* DatabaseAuthorizer.h */, 18504 97BC69D61505F076001B74AC /* DatabaseBackend.cpp */, 18505 97BC69D71505F076001B74AC /* DatabaseBackend.h */, 18506 18506 FE3371A0167C11D400EDB752 /* DatabaseBasicTypes.h */, 18507 18507 97BC69E31505F081001B74AC /* DatabaseCallback.h */, … … 22929 22929 buildActionMask = 2147483647; 22930 22930 files = ( 22931 97BC69DB1505F076001B74AC /* AbstractDatabase.h in Headers */,22932 22931 FE115FAB167988CD00249134 /* AbstractDatabaseServer.h in Headers */, 22933 22932 41E1B1D10FF5986900576B3B /* AbstractWorker.h in Headers */, … … 23289 23288 97BC6A211505F081001B74AC /* Database.h in Headers */, 23290 23289 97BC6A241505F081001B74AC /* DatabaseAuthorizer.h in Headers */, 23290 97BC69DB1505F076001B74AC /* DatabaseBackend.h in Headers */, 23291 23291 FE3371A2167C11D400EDB752 /* DatabaseBasicTypes.h in Headers */, 23292 23292 97BC6A251505F081001B74AC /* DatabaseCallback.h in Headers */, … … 26655 26655 buildActionMask = 2147483647; 26656 26656 files = ( 26657 97BC69DA1505F076001B74AC /* AbstractDatabase.cpp in Sources */,26658 26657 41E1B1D00FF5986900576B3B /* AbstractWorker.cpp in Sources */, 26659 26658 0F29C16E1300C2E2002D794E /* AccessibilityAllInOne.cpp in Sources */, … … 26934 26933 97BC6A201505F081001B74AC /* Database.cpp in Sources */, 26935 26934 97BC6A231505F081001B74AC /* DatabaseAuthorizer.cpp in Sources */, 26935 97BC69DA1505F076001B74AC /* DatabaseBackend.cpp in Sources */, 26936 26936 97BC6A271505F081001B74AC /* DatabaseContext.cpp in Sources */, 26937 26937 FE456F181677D74E005EDDF9 /* DatabaseManager.cpp in Sources */, -
trunk/Source/WebKit/chromium/ChangeLog
r141204 r141207 1 2013-01-29 Mark Lam <mark.lam@apple.com> 2 3 Rename AbstractDatabase to DatabaseBackend. 4 https://bugs.webkit.org/show_bug.cgi?id=108275. 5 6 Reviewed by Sam Weinig. 7 8 This is a pure rename operation as part of the webdatabase refactoring 9 effort. There is no semantic change in this patch. 10 11 * public/WebDatabase.h: 12 (WebDatabase): 13 * src/DatabaseObserver.cpp: 14 (WebCore::DatabaseObserver::databaseOpened): 15 (WebCore::DatabaseObserver::databaseModified): 16 (WebCore::DatabaseObserver::databaseClosed): 17 (WebCore::DatabaseObserver::reportOpenDatabaseResult): 18 (WebCore::DatabaseObserver::reportChangeVersionResult): 19 (WebCore::DatabaseObserver::reportStartTransactionResult): 20 (WebCore::DatabaseObserver::reportCommitTransactionResult): 21 (WebCore::DatabaseObserver::reportExecuteStatementResult): 22 (WebCore::DatabaseObserver::reportVacuumDatabaseResult): 23 * src/WebDatabase.cpp: 24 (WebKit::WebDatabase::WebDatabase): 25 1 26 2013-01-29 Sheriff Bot <webkit.review.bot@gmail.com> 2 27 -
trunk/Source/WebKit/chromium/public/WebDatabase.h
r140621 r141207 35 35 #include "WebSecurityOrigin.h" 36 36 37 namespace WebCore { class AbstractDatabase; }37 namespace WebCore { class DatabaseBackend; } 38 38 39 39 namespace WebKit { … … 64 64 65 65 #if WEBKIT_IMPLEMENTATION 66 WebDatabase(const WebCore:: AbstractDatabase*);66 WebDatabase(const WebCore::DatabaseBackend*); 67 67 #endif 68 68 69 69 private: 70 70 WebDatabase() { } 71 const WebCore:: AbstractDatabase* m_database;71 const WebCore::DatabaseBackend* m_database; 72 72 }; 73 73 -
trunk/Source/WebKit/chromium/src/DatabaseObserver.cpp
r138693 r141207 34 34 #if ENABLE(SQL_DATABASE) 35 35 36 #include "AbstractDatabase.h"37 36 #include "CrossThreadCopier.h" 38 37 #include "CrossThreadTask.h" 38 #include "DatabaseBackend.h" 39 39 #include "Document.h" 40 40 #include "ScriptExecutionContext.h" … … 178 178 } 179 179 180 void DatabaseObserver::databaseOpened( AbstractDatabase* database)180 void DatabaseObserver::databaseOpened(DatabaseBackend* database) 181 181 { 182 182 ASSERT(database->scriptExecutionContext()->isContextThread()); … … 184 184 } 185 185 186 void DatabaseObserver::databaseModified( AbstractDatabase* database)186 void DatabaseObserver::databaseModified(DatabaseBackend* database) 187 187 { 188 188 ASSERT(database->scriptExecutionContext()->isContextThread()); … … 190 190 } 191 191 192 void DatabaseObserver::databaseClosed( AbstractDatabase* database)192 void DatabaseObserver::databaseClosed(DatabaseBackend* database) 193 193 { 194 194 ASSERT(database->scriptExecutionContext()->isContextThread()); … … 196 196 } 197 197 198 void DatabaseObserver::reportOpenDatabaseResult( AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)198 void DatabaseObserver::reportOpenDatabaseResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode) 199 199 { 200 200 WebDatabase::observer()->reportOpenDatabaseResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode); 201 201 } 202 202 203 void DatabaseObserver::reportChangeVersionResult( AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)203 void DatabaseObserver::reportChangeVersionResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode) 204 204 { 205 205 WebDatabase::observer()->reportChangeVersionResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode); 206 206 } 207 207 208 void DatabaseObserver::reportStartTransactionResult( AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)208 void DatabaseObserver::reportStartTransactionResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode) 209 209 { 210 210 WebDatabase::observer()->reportStartTransactionResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode); 211 211 } 212 212 213 void DatabaseObserver::reportCommitTransactionResult( AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)213 void DatabaseObserver::reportCommitTransactionResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode) 214 214 { 215 215 WebDatabase::observer()->reportCommitTransactionResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode); 216 216 } 217 217 218 void DatabaseObserver::reportExecuteStatementResult( AbstractDatabase* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode)218 void DatabaseObserver::reportExecuteStatementResult(DatabaseBackend* database, int errorSite, int webSqlErrorCode, int sqliteErrorCode) 219 219 { 220 220 WebDatabase::observer()->reportExecuteStatementResult(WebDatabase(database), errorSite, webSqlErrorCode, sqliteErrorCode); 221 221 } 222 222 223 void DatabaseObserver::reportVacuumDatabaseResult( AbstractDatabase* database, int sqliteErrorCode)223 void DatabaseObserver::reportVacuumDatabaseResult(DatabaseBackend* database, int sqliteErrorCode) 224 224 { 225 225 WebDatabase::observer()->reportVacuumDatabaseResult(WebDatabase(database), sqliteErrorCode); -
trunk/Source/WebKit/chromium/src/WebDatabase.cpp
r137520 r141207 32 32 #include "WebDatabase.h" 33 33 34 #include " AbstractDatabase.h"34 #include "DatabaseBackend.h" 35 35 #include "DatabaseManager.h" 36 36 #include "QuotaTracker.h" … … 43 43 #if !ENABLE(SQL_DATABASE) 44 44 namespace WebCore { 45 class AbstractDatabase{45 class DatabaseBackend { 46 46 public: 47 47 String stringIdentifier() const { return String(); } … … 128 128 } 129 129 130 WebDatabase::WebDatabase(const AbstractDatabase* database)130 WebDatabase::WebDatabase(const DatabaseBackend* database) 131 131 : m_database(database) 132 132 {
Note: See TracChangeset
for help on using the changeset viewer.