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

Source/WebCore/storage/SQLTransactionSync.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 40 matching lines @@
 
 PassRefPtr<SQLTransactionSync> SQLTransactionSync::create(DatabaseSync* db, PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly)
 {
     return adoptRef(new SQLTransactionSync(db, callback, readOnly));
 }
 
 SQLTransactionSync::SQLTransactionSync(DatabaseSync* db, PassRefPtr<SQLTransactionSyncCallback> callback, bool readOnly)
     : m_database(db)
     , m_callback(callback)
     , m_readOnly(readOnly)
+    , m_hasVersionMismatch(false)
     , m_modifiedDatabase(false)
     , m_transactionClient(adoptPtr(new SQLTransactionClient()))
 {
     ASSERT(m_database->scriptExecutionContext()->isContextThread());
 }
 
 SQLTransactionSync::~SQLTransactionSync()
 {
     ASSERT(m_database->scriptExecutionContext()->isContextThread());
     if (m_sqliteTransaction && m_sqliteTransaction->inProgress())
         rollback();
 }
 
 PassRefPtr<SQLResultSet> SQLTransactionSync::executeSQL(const String& sqlStatement, const Vector<SQLValue>& arguments, ExceptionCode& ec)
 {
     ASSERT(m_database->scriptExecutionContext()->isContextThread());
     if (!m_database->opened()) {
         ec = SQLException::UNKNOWN_ERR;
         return 0;
     }
 
-    if (!m_database->versionMatchesExpected()) {
+    if (m_hasVersionMismatch) {
         ec = SQLException::VERSION_ERR;
         return 0;
     }
 
     if (sqlStatement.isEmpty())
         return 0;
 
     int permissions = DatabaseAuthorizer::ReadWriteMask;
     if (!m_database->scriptExecutionContext()->allowDatabaseAccess())
       permissions |= DatabaseAuthorizer::NoAccessMask;
@@ skipping 50 matching lines @@
     m_sqliteTransaction->begin();
     m_database->enableAuthorizer();
 
     // Check if begin() succeeded.
     if (!m_sqliteTransaction->inProgress()) {
         ASSERT(!m_database->sqliteDatabase().transactionInProgress());
         m_sqliteTransaction.clear();
         return SQLException::DATABASE_ERR;
     }
 
+    // Note: We intentionally retrieve the actual version even with an empty expected version.
+    // In multi-process browsers, we take this opportinutiy to update the cached value for
+    // the actual version. In single-process browsers, this is just a map lookup.
+    String actualVersion;
+    if (!m_database->getActualVersionForTransaction(actualVersion)) {
+        rollback();
+        return SQLException::DATABASE_ERR;
+    }
+    m_hasVersionMismatch = !m_database->expectedVersion().isEmpty()
+                           && (m_database->expectedVersion() != actualVersion);
     return 0;
 }
 
 ExceptionCode SQLTransactionSync::execute()
 {
     ASSERT(m_database->scriptExecutionContext()->isContextThread());
     if (!m_database->opened() || (m_callback && !m_callback->handleEvent(this))) {
         m_callback = 0;
         return SQLException::UNKNOWN_ERR;
     }
@@ skipping 40 matching lines @@
         m_sqliteTransaction.clear();
     }
     m_database->enableAuthorizer();
 
     ASSERT(!m_database->sqliteDatabase().transactionInProgress());
 }
 
 } // namespace WebCore
 
 #endif // ENABLE(DATABASE)