Changeset 52569 in webkit
- Timestamp:
- Dec 26, 2009 11:36:32 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r52567 r52569 1 2009-12-26 Eric Seidel <eric@webkit.org> 2 3 No review, rolling out r52554. 4 http://trac.webkit.org/changeset/52554 5 6 https://bugs.webkit.org/show_bug.cgi?id=32955 7 The original change was covered under 8 https://bugs.webkit.org/show_bug.cgi?id=32913 9 10 r52554 was itself a rollout of r52536. 11 However it caused two layout tests to fail on Leopard: 12 storage/open-database-while-transaction-in-progress.html 13 svg/W3C-SVG-1.1/filters-conv-01-f.svg (no clue why?) 14 15 So I'm rolling out the rollout in an attempt to get the bots green. 16 r52554 did not explain why it was rolled out, so I do not know 17 what might fail for Chromium after this change. I warned the folks 18 in #chromium that it was coming. 19 20 * storage/Database.cpp: 21 (WebCore::Database::openDatabase): 22 (WebCore::Database::Database): 23 (WebCore::Database::performOpenAndVerify): 24 1 25 2009-12-26 Dan Bernstein <mitz@apple.com> 2 26 -
trunk/WebCore/storage/Database.cpp
r52554 r52569 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.