Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(133)

Unified Diff: Source/WebCore/Modules/indexeddb/IDBRequest.cpp

Issue 10007047: Merge 112740 - IndexedDB: Race condition causes version change transaction to commit after onblocked (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1084/
Patch Set: Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « LayoutTests/storage/indexeddb/resources/dont-commit-on-blocked-worker.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/Modules/indexeddb/IDBRequest.cpp
===================================================================
--- Source/WebCore/Modules/indexeddb/IDBRequest.cpp (revision 113498)
+++ Source/WebCore/Modules/indexeddb/IDBRequest.cpp (working copy)
@@ -378,7 +378,7 @@
if (cursorToNotify)
cursorToNotify->postSuccessHandlerCallback();
- if (m_transaction) {
+ if (m_transaction && event->type() != eventNames().blockedEvent) {
// If an error event and the default wasn't prevented...
if (dontPreventDefault && event->type() == eventNames().errorEvent)
m_transaction->backend()->abort();
« no previous file with comments | « LayoutTests/storage/indexeddb/resources/dont-commit-on-blocked-worker.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698