Merge 92155 - [Chromium] WebSQLDatabase version handling is broken in multi-process browsers.

Source/WebCore/storage/DatabaseSync.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 49 matching lines @@
 
     if (!database->performOpenAndVerify(!creationCallback, ec)) {
         LOG(StorageAPI, "Failed to open and verify version (expected %s) of database %s", expectedVersion.ascii().data(), database->databaseDebugName().ascii().data());
         DatabaseTracker::tracker().removeOpenDatabase(database.get());
         return 0;
     }
 
     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());
     }
 
     return database;
 }
 
 DatabaseSync::DatabaseSync(ScriptExecutionContext* context, const String& name, const String& expectedVersion,
                            const String& displayName, unsigned long estimatedSize)
     : AbstractDatabase(context, name, expectedVersion, displayName, estimatedSize)
@@ skipping 35 matching lines @@
     }
 
     if ((ec = transaction->execute()))
         return;
 
     if (!setVersionInDatabase(newVersion)) {
         ec = SQLException::UNKNOWN_ERR;
         return;
     }
 
-    if ((ec = transaction->commit()))
+    if ((ec = transaction->commit())) {
+        setCachedVersion(oldVersion);
         return;
+    }
 
     setExpectedVersion(newVersion);
 }
 
 void DatabaseSync::transaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionCode& ec)
 {
     runTransaction(callback, false, ec);
 }
 
 void DatabaseSync::readTransaction(PassRefPtr<SQLTransactionSyncCallback> callback, ExceptionCode& ec)
@@ skipping 52 matching lines @@
         return;
 
     DatabaseTracker::tracker().removeOpenDatabase(this);
 
     closeDatabase();
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(DATABASE)