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

Unified Diff: Source/WebCore/storage/DatabaseSync.cpp

Issue 7563014: Merge 92155 - [Chromium] WebSQLDatabase version handling is broken in multi-process browsers. (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/835/
Patch Set: Created 9 years, 5 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 | « Source/WebCore/storage/Database.cpp ('k') | Source/WebCore/storage/SQLTransaction.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/WebCore/storage/DatabaseSync.cpp
===================================================================
--- Source/WebCore/storage/DatabaseSync.cpp (revision 92303)
+++ Source/WebCore/storage/DatabaseSync.cpp (working copy)
@@ -67,7 +67,6 @@
DatabaseTracker::tracker().setDatabaseDetails(context->securityOrigin(), name, displayName, estimatedSize);
if (database->isNew() && creationCallback.get()) {
- database->m_expectedVersion = "";
LOG(StorageAPI, "Invoking the creation callback for database %p\n", database.get());
creationCallback->handleEvent(database.get());
}
@@ -123,8 +122,10 @@
return;
}
- if ((ec = transaction->commit()))
+ if ((ec = transaction->commit())) {
+ setCachedVersion(oldVersion);
return;
+ }
setExpectedVersion(newVersion);
}
« no previous file with comments | « Source/WebCore/storage/Database.cpp ('k') | Source/WebCore/storage/SQLTransaction.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698