Changeset 52536 in webkit
- Timestamp:
- Dec 23, 2009 5:38:53 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r52535 r52536 1 2009-12-23 Dumitru Daniliuc <dumi@chromium.org> 2 3 Reviewed by Eric Seidel. 4 5 A new database should be registered with the Document, 6 DatabaseTracker and DatabaseThread only after it was successfully 7 opened and its version was successfully verified. 8 9 Fixes a regression introduced by 10 http://trac.webkit.org/changeset/52530. 11 12 LayoutTests/storage/open-database-while-transaction-in-progress.html 13 should pass again (or rather, it should pass again when run after 14 open-database-set-empty-version.html). 15 16 https://bugs.webkit.org/show_bug.cgi?id=32913 17 18 * storage/Database.cpp: 19 (WebCore::Database::openDatabase): 20 (WebCore::Database::Database): 21 (WebCore::Database::performOpenAndVerify): 22 1 23 2009-12-23 David Levin <levin@chromium.org> 2 24 -
trunk/WebCore/storage/Database.cpp
r52530 r52536 133 133 if (!database->openAndVerifyVersion(e)) { 134 134 LOG(StorageAPI, "Failed to open and verify version (expected %s) of database %s", expectedVersion.ascii().data(), database->databaseDebugName().ascii().data()); 135 document->removeOpenDatabase(database.get());136 DatabaseTracker::tracker().removeOpenDatabase(database.get());137 135 return 0; 138 136 } 137 138 DatabaseTracker::tracker().addOpenDatabase(database.get()); 139 document->addOpenDatabase(database.get()); 139 140 140 141 DatabaseTracker::tracker().setDatabaseDetails(document->securityOrigin(), name, displayName, estimatedSize); … … 189 190 190 191 m_filename = DatabaseTracker::tracker().fullPathForDatabase(m_mainThreadSecurityOrigin.get(), m_name); 191 192 DatabaseTracker::tracker().addOpenDatabase(this);193 m_document->addOpenDatabase(this);194 192 } 195 193 … … 462 460 return false; 463 461 } 464 465 m_opened = true;466 if (m_document->databaseThread())467 m_document->databaseThread()->recordDatabaseOpen(this);468 462 469 463 ASSERT(m_databaseAuthorizer); … … 526 520 } 527 521 522 m_opened = true; 523 if (m_document->databaseThread()) 524 m_document->databaseThread()->recordDatabaseOpen(this); 525 528 526 return true; 529 527 }
Note: See TracChangeset
for help on using the changeset viewer.