Diff
Modified: trunk/Source/WebCore/ChangeLog (124544 => 124545)
--- trunk/Source/WebCore/ChangeLog 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/ChangeLog 2012-08-03 01:32:28 UTC (rev 124545)
@@ -1,3 +1,42 @@
+2012-08-02 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r124540.
+ http://trac.webkit.org/changeset/124540
+ https://bugs.webkit.org/show_bug.cgi?id=93055
+
+ Broke compile on Chromium Win bot (Requested by dimich on
+ #webkit).
+
+ * Modules/indexeddb/IDBBackingStore.h:
+ (IDBBackingStore):
+ * Modules/indexeddb/IDBCallbacks.h:
+ (IDBCallbacks):
+ * Modules/indexeddb/IDBDatabaseBackendImpl.cpp:
+ (WebCore::IDBDatabaseBackendImpl::PendingOpenCall::PendingOpenCall):
+ (WebCore::IDBDatabaseBackendImpl::IDBDatabaseBackendImpl):
+ (WebCore::IDBDatabaseBackendImpl::openInternal):
+ (WebCore::IDBDatabaseBackendImpl::metadata):
+ (WebCore::IDBDatabaseBackendImpl::setVersion):
+ (WebCore::IDBDatabaseBackendImpl::transactionFinished):
+ (WebCore::IDBDatabaseBackendImpl::processPendingCalls):
+ (WebCore::IDBDatabaseBackendImpl::registerFrontendCallbacks):
+ (WebCore::IDBDatabaseBackendImpl::deleteDatabase):
+ (WebCore::IDBDatabaseBackendImpl::close):
+ * Modules/indexeddb/IDBDatabaseBackendImpl.h:
+ (IDBDatabaseBackendImpl):
+ * Modules/indexeddb/IDBDatabaseCallbacks.h:
+ (IDBDatabaseCallbacks):
+ * Modules/indexeddb/IDBFactoryBackendImpl.cpp:
+ (WebCore::IDBFactoryBackendImpl::open):
+ * Modules/indexeddb/IDBLevelDBBackingStore.cpp:
+ (WebCore::IDBLevelDBBackingStore::getIDBDatabaseMetaData):
+ (WebCore::IDBLevelDBBackingStore::createIDBDatabaseMetaData):
+ (WebCore::IDBLevelDBBackingStore::deleteDatabase):
+ * Modules/indexeddb/IDBLevelDBBackingStore.h:
+ (IDBLevelDBBackingStore):
+ * Modules/indexeddb/IDBTransactionBackendImpl.cpp:
+ (WebCore::IDBTransactionBackendImpl::commit):
+
2012-08-02 Arvid Nilsson <[email protected]>
[BlackBerry] Upstream GraphicsLayerClient::contentsVisible()
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.h (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.h 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBBackingStore.h 2012-08-03 01:32:28 UTC (rev 124545)
@@ -47,9 +47,8 @@
virtual ~IDBBackingStore() {};
virtual void getDatabaseNames(Vector<String>& foundNames) = 0;
- virtual bool getIDBDatabaseMetaData(const String& name, String& foundStringVersion, int64_t& foundIntVersion, int64_t& foundId) = 0;
- virtual bool createIDBDatabaseMetaData(const String& name, const String& stringVersion, const int64_t intVersion, int64_t& rowId) = 0;
- virtual bool updateIDBDatabaseIntVersion(int64_t rowId, int64_t intVersion) = 0;
+ virtual bool getIDBDatabaseMetaData(const String& name, String& foundVersion, int64_t& foundId) = 0;
+ virtual bool createIDBDatabaseMetaData(const String& name, const String& version, int64_t& rowId) = 0;
virtual bool updateIDBDatabaseMetaData(int64_t rowId, const String& version) = 0;
virtual bool deleteDatabase(const String& name) = 0;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBCallbacks.h 2012-08-03 01:32:28 UTC (rev 124545)
@@ -59,9 +59,7 @@
virtual void onSuccess(PassRefPtr<SerializedScriptValue>, PassRefPtr<IDBKey>, const IDBKeyPath&) = 0;
virtual void onSuccessWithContinuation() = 0;
virtual void onSuccessWithPrefetch(const Vector<RefPtr<IDBKey> >& keys, const Vector<RefPtr<IDBKey> >& primaryKeys, const Vector<RefPtr<SerializedScriptValue> >& values) = 0;
- virtual void onBlocked() { ASSERT_NOT_REACHED(); }
- virtual void onBlocked(int64_t existingVersion) { ASSERT_NOT_REACHED(); }
- virtual void onUpgradeNeeded(int64_t oldVersion, PassRefPtr<IDBTransactionBackendInterface>, PassRefPtr<IDBDatabaseBackendInterface>) { ASSERT_NOT_REACHED(); }
+ virtual void onBlocked() = 0;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.cpp 2012-08-03 01:32:28 UTC (rev 124545)
@@ -52,29 +52,9 @@
: m_callbacks(callbacks)
{
}
-
RefPtr<IDBCallbacks> m_callbacks;
};
-class IDBDatabaseBackendImpl::PendingOpenWithVersionCall : public RefCounted<PendingOpenWithVersionCall> {
-public:
- static PassRefPtr<PendingOpenWithVersionCall> create(PassRefPtr<IDBCallbacks> callbacks, int64_t version)
- {
- return adoptRef(new PendingOpenWithVersionCall(callbacks, version));
- }
- PassRefPtr<IDBCallbacks> callbacks() { return m_callbacks; }
- int64_t version() { return m_version; }
-
-private:
- PendingOpenWithVersionCall(PassRefPtr<IDBCallbacks> callbacks, int64_t version)
- : m_callbacks(callbacks)
- , m_version(version)
- {
- }
- RefPtr<IDBCallbacks> m_callbacks;
- int64_t m_version;
-};
-
class IDBDatabaseBackendImpl::PendingDeleteCall : public RefCounted<PendingDeleteCall> {
public:
static PassRefPtr<PendingDeleteCall> create(PassRefPtr<IDBCallbacks> callbacks)
@@ -126,7 +106,6 @@
, m_id(InvalidId)
, m_name(name)
, m_version("")
- , m_intVersion(IDBDatabaseMetadata::NoIntVersion)
, m_identifier(uniqueIdentifier)
, m_factory(factory)
, m_transactionCoordinator(coordinator)
@@ -137,13 +116,13 @@
bool IDBDatabaseBackendImpl::openInternal()
{
- bool success = m_backingStore->getIDBDatabaseMetaData(m_name, m_version, m_intVersion, m_id);
- ASSERT_WITH_MESSAGE(success == (m_id != InvalidId), "success = %s, m_id = %"PRId64, success ? "true" : "false", m_id);
+ bool success = m_backingStore->getIDBDatabaseMetaData(m_name, m_version, m_id);
+ ASSERT(success == (m_id != InvalidId));
if (success) {
loadObjectStores();
return true;
}
- return m_backingStore->createIDBDatabaseMetaData(m_name, m_version, m_intVersion, m_id);
+ return m_backingStore->createIDBDatabaseMetaData(m_name, m_version, m_id);
}
IDBDatabaseBackendImpl::~IDBDatabaseBackendImpl()
@@ -157,7 +136,7 @@
IDBDatabaseMetadata IDBDatabaseBackendImpl::metadata() const
{
- IDBDatabaseMetadata metadata(m_name, m_version, m_intVersion);
+ IDBDatabaseMetadata metadata(m_name, m_version, IDBDatabaseMetadata::NoIntVersion);
for (ObjectStoreMap::const_iterator it = m_objectStores.begin(); it != m_objectStores.end(); ++it)
metadata.objectStores.set(it->first, it->second->metadata());
return metadata;
@@ -235,10 +214,6 @@
callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::IDB_ABORT_ERR, "Connection was closed before set version transaction was created"));
return;
}
- if (m_intVersion != IDBDatabaseMetadata::NoIntVersion) {
- callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, String::format("You can't use the setVersion function if you've already set the version through an open call. The current integer version is %"PRId64, m_intVersion)));
- return;
- }
for (DatabaseCallbacksSet::const_iterator it = m_databaseCallbacksSet.begin(); it != m_databaseCallbacksSet.end(); ++it) {
if (*it != databaseCallbacks)
(*it)->onVersionChange(version);
@@ -284,20 +259,6 @@
callbacks->onSuccess(PassRefPtr<IDBTransactionBackendInterface>(transaction));
}
-void IDBDatabaseBackendImpl::setIntVersionInternal(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl> database, int64_t version, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<IDBTransactionBackendInterface> transaction)
-{
- int64_t databaseId = database->id();
- int64_t oldVersion = database->m_intVersion;
- ASSERT(version > oldVersion);
- database->m_intVersion = version;
- if (!database->m_backingStore->updateIDBDatabaseIntVersion(databaseId, database->m_intVersion)) {
- callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Error writing data to stable storage."));
- transaction->abort();
- return;
- }
- callbacks->onUpgradeNeeded(oldVersion, transaction, database);
-}
-
void IDBDatabaseBackendImpl::transactionStarted(PassRefPtr<IDBTransactionBackendImpl> prpTransaction)
{
RefPtr<IDBTransactionBackendImpl> transaction = prpTransaction;
@@ -315,16 +276,6 @@
if (transaction->mode() == IDBTransaction::VERSION_CHANGE) {
ASSERT(transaction.get() == m_runningVersionChangeTransaction.get());
m_runningVersionChangeTransaction.clear();
- }
-}
-
-void IDBDatabaseBackendImpl::transactionFinishedAndEventsFired(PassRefPtr<IDBTransactionBackendImpl> prpTransaction)
-{
- RefPtr<IDBTransactionBackendImpl> transaction = prpTransaction;
- if (transaction->mode() == IDBTransaction::VERSION_CHANGE) {
- // If this was an open-with-version call, there will be a "second
- // half" open call waiting for us in processPendingCalls.
- // FIXME: When we no longer support setVersion, assert such a thing.
processPendingCalls();
}
}
@@ -336,16 +287,7 @@
void IDBDatabaseBackendImpl::processPendingCalls()
{
- // FIXME: Change from queue to just a single place holder.
- ASSERT(m_pendingSecondHalfOpenWithVersionCalls.size() <= 1);
- while (!m_pendingSecondHalfOpenWithVersionCalls.isEmpty()) {
- RefPtr<PendingOpenWithVersionCall> pendingOpenWithVersionCall = m_pendingSecondHalfOpenWithVersionCalls.takeFirst();
- ASSERT(pendingOpenWithVersionCall->version() == m_intVersion);
- ASSERT(m_id != InvalidId);
- ++m_pendingConnectionCount;
- pendingOpenWithVersionCall->callbacks()->onSuccess(this);
- return;
- }
+ ASSERT(connectionCount() <= 1);
// Pending calls may be requeued or aborted
Deque<RefPtr<PendingSetVersionCall> > pendingSetVersionCalls;
@@ -383,13 +325,6 @@
if (m_runningVersionChangeTransaction || !m_pendingSetVersionCalls.isEmpty() || !m_pendingDeleteCalls.isEmpty())
return;
- Deque<RefPtr<PendingOpenWithVersionCall> > pendingOpenWithVersionCalls;
- m_pendingOpenWithVersionCalls.swap(pendingOpenWithVersionCalls);
- while (!pendingOpenWithVersionCalls.isEmpty()) {
- RefPtr<PendingOpenWithVersionCall> pendingOpenWithVersionCall = pendingOpenWithVersionCalls.takeFirst();
- openConnectionWithVersion(pendingOpenWithVersionCall->callbacks(), pendingOpenWithVersionCall->version());
- }
-
// Given the check above, it appears that calls cannot be requeued by
// openConnection, but use a different queue for iteration to be safe.
Deque<RefPtr<PendingOpenCall> > pendingOpenCalls;
@@ -421,10 +356,6 @@
ASSERT(m_pendingConnectionCount);
--m_pendingConnectionCount;
m_databaseCallbacksSet.add(RefPtr<IDBDatabaseCallbacks>(callbacks));
- // We give max priority to open calls that follow upgradeneeded
- // events; trigger the rest of the queues to be serviced when those open
- // calls are finished.
- processPendingCalls();
}
void IDBDatabaseBackendImpl::openConnection(PassRefPtr<IDBCallbacks> callbacks)
@@ -442,80 +373,6 @@
}
}
-void IDBDatabaseBackendImpl::runIntVersionChangeTransaction(int64_t requestedVersion, PassRefPtr<IDBCallbacks> prpCallbacks)
-{
- // FIXME: This function won't be reached until it's exposed to script in
- // wbk.ug/92897.
- ASSERT_NOT_REACHED();
-
- RefPtr<IDBCallbacks> callbacks = prpCallbacks;
- ASSERT(callbacks);
- for (DatabaseCallbacksSet::const_iterator it = m_databaseCallbacksSet.begin(); it != m_databaseCallbacksSet.end(); ++it) {
- // Note that some connections might close in the versionchange event
- // handler for some other connection, after which its own versionchange
- // event should not be fired. The backend doesn't worry about this, we
- // just queue up a version change event for every connection. The
- // frontend takes care to only dispatch to open connections.
- (*it)->onVersionChange(m_intVersion, requestedVersion);
- }
- // The spec dictates we wait until all the version change events are
- // delivered and then check m_databaseCallbacks.empty() before proceeding
- // or firing a blocked event, but instead we should be consistent with how
- // the old setVersion (incorrectly) did it.
- // FIXME: Remove the call to onBlocked and instead wait until the frontend
- // tells us that all the blocked events have been delivered. See
- // https://bugs.webkit.org/show_bug.cgi?id=71130
- if (connectionCount() > 0)
- callbacks->onBlocked(m_intVersion);
- // FIXME: Add test for m_runningVersionChangeTransaction.
- if (m_runningVersionChangeTransaction || connectionCount() > 0) {
- m_pendingOpenWithVersionCalls.append(PendingOpenWithVersionCall::create(callbacks, requestedVersion));
- return;
- }
-
- RefPtr<DOMStringList> objectStoreNames = DOMStringList::create();
- ExceptionCode ec = 0;
- RefPtr<IDBTransactionBackendInterface> transactionInterface = transaction(objectStoreNames.get(), IDBTransaction::VERSION_CHANGE, ec);
- RefPtr<IDBTransactionBackendImpl> transaction = IDBTransactionBackendImpl::from(transactionInterface.get());
- ASSERT(!ec);
-
- RefPtr<IDBDatabaseBackendImpl> database = this;
- PassOwnPtr<ScriptExecutionContext::Task> intVersionTask = createCallbackTask(&IDBDatabaseBackendImpl::setIntVersionInternal, database, requestedVersion, callbacks, transaction);
- // FIXME: Make this reset the integer version as well.
- PassOwnPtr<ScriptExecutionContext::Task> resetVersionOnAbortTask = createCallbackTask(&IDBDatabaseBackendImpl::resetVersion, database, m_version);
- if (!transaction->scheduleTask(intVersionTask, resetVersionOnAbortTask))
- ec = IDBDatabaseException::TRANSACTION_INACTIVE_ERR;
- m_pendingSecondHalfOpenWithVersionCalls.append(PendingOpenWithVersionCall::create(callbacks, requestedVersion));
-}
-
-void IDBDatabaseBackendImpl::openConnectionWithVersion(PassRefPtr<IDBCallbacks> prpCallbacks, int64_t version)
-{
- RefPtr<IDBCallbacks> callbacks = prpCallbacks;
- if (!m_pendingDeleteCalls.isEmpty() || m_runningVersionChangeTransaction || !m_pendingSetVersionCalls.isEmpty()) {
- m_pendingOpenWithVersionCalls.append(PendingOpenWithVersionCall::create(callbacks, version));
- return;
- }
- if (m_id == InvalidId) {
- if (openInternal())
- ASSERT(m_intVersion == IDBDatabaseMetadata::NoIntVersion);
- else {
- callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error."));
- return;
- }
- }
- if (version > m_intVersion) {
- runIntVersionChangeTransaction(version, callbacks);
- return;
- }
- if (version < m_intVersion) {
- callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::VER_ERR, String::format("The requested version (%"PRId64") is less than the existing version (%"PRId64").", version, m_intVersion)));
- return;
- }
- ASSERT(version == m_intVersion);
- ++m_pendingConnectionCount;
- callbacks->onSuccess(this);
-}
-
void IDBDatabaseBackendImpl::deleteDatabase(PassRefPtr<IDBCallbacks> prpCallbacks)
{
if (m_runningVersionChangeTransaction || !m_pendingSetVersionCalls.isEmpty()) {
@@ -531,19 +388,17 @@
// FIXME: Only fire onBlocked if there are open connections after the
// VersionChangeEvents are received, not just set up to fire.
// https://bugs.webkit.org/show_bug.cgi?id=71130
- if (connectionCount() >= 1) {
+ if (!m_databaseCallbacksSet.isEmpty()) {
m_pendingDeleteCalls.append(PendingDeleteCall::create(callbacks));
callbacks->onBlocked();
return;
}
- ASSERT(m_backingStore);
if (!m_backingStore->deleteDatabase(m_name)) {
callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error."));
return;
}
m_version = "";
m_id = InvalidId;
- m_intVersion = IDBDatabaseMetadata::NoIntVersion;
m_objectStores.clear();
callbacks->onSuccess(SerializedScriptValue::nullValue());
}
@@ -556,17 +411,12 @@
if (connectionCount() > 1)
return;
- TransactionSet transactions(m_transactions);
processPendingCalls();
- ASSERT(m_transactions.size() - transactions.size() <= 1);
- // FIXME: Instead of relying on transactions.size(), make connectionCount
- // aware of in-flight upgradeneeded events as well as in-flight success
- // events.
- if (!connectionCount() && !m_pendingDeleteCalls.size() && m_transactions.size() == transactions.size()) {
+ if (!connectionCount()) {
+ TransactionSet transactions(m_transactions);
for (TransactionSet::const_iterator it = transactions.begin(); it != transactions.end(); ++it)
(*it)->abort();
-
ASSERT(m_transactions.isEmpty());
m_backingStore.clear();
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseBackendImpl.h 2012-08-03 01:32:28 UTC (rev 124545)
@@ -57,7 +57,6 @@
void registerFrontendCallbacks(PassRefPtr<IDBDatabaseCallbacks>);
void openConnection(PassRefPtr<IDBCallbacks>);
- void openConnectionWithVersion(PassRefPtr<IDBCallbacks>, int64_t version);
void deleteDatabase(PassRefPtr<IDBCallbacks>);
// IDBDatabaseBackendInterface
@@ -72,13 +71,11 @@
IDBTransactionCoordinator* transactionCoordinator() const { return m_transactionCoordinator.get(); }
void transactionStarted(PassRefPtr<IDBTransactionBackendImpl>);
void transactionFinished(PassRefPtr<IDBTransactionBackendImpl>);
- void transactionFinishedAndEventsFired(PassRefPtr<IDBTransactionBackendImpl>);
private:
IDBDatabaseBackendImpl(const String& name, IDBBackingStore* database, IDBTransactionCoordinator*, IDBFactoryBackendImpl*, const String& uniqueIdentifier);
bool openInternal();
- void runIntVersionChangeTransaction(int64_t requestedVersion, PassRefPtr<IDBCallbacks>);
void loadObjectStores();
int32_t connectionCount();
void processPendingCalls();
@@ -86,7 +83,6 @@
static void createObjectStoreInternal(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl>, PassRefPtr<IDBObjectStoreBackendImpl>, PassRefPtr<IDBTransactionBackendImpl>);
static void deleteObjectStoreInternal(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl>, PassRefPtr<IDBObjectStoreBackendImpl>, PassRefPtr<IDBTransactionBackendImpl>);
static void setVersionInternal(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl>, const String& version, PassRefPtr<IDBCallbacks>, PassRefPtr<IDBTransactionBackendImpl>);
- static void setIntVersionInternal(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl>, int64_t version, PassRefPtr<IDBCallbacks>, PassRefPtr<IDBTransactionBackendInterface>);
// These are used as setVersion transaction abort tasks.
static void removeObjectStoreFromMap(ScriptExecutionContext*, PassRefPtr<IDBDatabaseBackendImpl>, PassRefPtr<IDBObjectStoreBackendImpl>);
@@ -97,7 +93,6 @@
int64_t m_id;
String m_name;
String m_version;
- int64_t m_intVersion;
String m_identifier;
// This might not need to be a RefPtr since the factory's lifetime is that of the page group, but it's better to be conservitive than sorry.
@@ -118,10 +113,6 @@
class PendingOpenCall;
Deque<RefPtr<PendingOpenCall> > m_pendingOpenCalls;
- class PendingOpenWithVersionCall;
- Deque<RefPtr<PendingOpenWithVersionCall> > m_pendingOpenWithVersionCalls;
- Deque<RefPtr<PendingOpenWithVersionCall> > m_pendingSecondHalfOpenWithVersionCalls;
-
class PendingDeleteCall;
Deque<RefPtr<PendingDeleteCall> > m_pendingDeleteCalls;
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacks.h (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacks.h 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBDatabaseCallbacks.h 2012-08-03 01:32:28 UTC (rev 124545)
@@ -38,7 +38,6 @@
virtual ~IDBDatabaseCallbacks() { }
virtual void onVersionChange(const String& version) = 0;
- virtual void onVersionChange(int64_t currentVersion, int64_t requestedVersion) { ASSERT_NOT_REACHED(); }
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendImpl.cpp (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendImpl.cpp 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBFactoryBackendImpl.cpp 2012-08-03 01:32:28 UTC (rev 124545)
@@ -35,7 +35,6 @@
#include "IDBDatabaseException.h"
#include "IDBLevelDBBackingStore.h"
#include "IDBTransactionCoordinator.h"
-#include "SecurityOrigin.h"
#include <wtf/Threading.h>
#include <wtf/UnusedParam.h>
@@ -152,34 +151,30 @@
void IDBFactoryBackendImpl::open(const String& name, PassRefPtr<IDBCallbacks> callbacks, PassRefPtr<SecurityOrigin> prpSecurityOrigin, ScriptExecutionContext*, const String& dataDirectory)
{
- // FIXME: Make this a parameter and plumb through from _javascript_.
- int64_t version = IDBDatabaseMetadata::NoIntVersion;
RefPtr<SecurityOrigin> securityOrigin = prpSecurityOrigin;
const String uniqueIdentifier = computeUniqueIdentifier(name, securityOrigin.get());
- RefPtr<IDBDatabaseBackendImpl> databaseBackend;
IDBDatabaseBackendMap::iterator it = m_databaseBackendMap.find(uniqueIdentifier);
- if (it == m_databaseBackendMap.end()) {
- RefPtr<IDBBackingStore> backingStore = openBackingStore(securityOrigin, dataDirectory);
- if (!backingStore) {
- callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error."));
- return;
- }
+ if (it != m_databaseBackendMap.end()) {
+ // If it's already been opened, we have to wait for any pending
+ // setVersion calls to complete.
+ it->second->openConnection(callbacks);
+ return;
+ }
- databaseBackend = IDBDatabaseBackendImpl::create(name, backingStore.get(), m_transactionCoordinator.get(), this, uniqueIdentifier);
- if (databaseBackend)
- m_databaseBackendMap.set(uniqueIdentifier, databaseBackend.get());
- else {
- callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error."));
- return;
- }
- } else
- databaseBackend = it->second;
+ // FIXME: Everything from now on should be done on another thread.
+ RefPtr<IDBBackingStore> backingStore = openBackingStore(securityOrigin, dataDirectory);
+ if (!backingStore) {
+ callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error."));
+ return;
+ }
- if (version == IDBDatabaseMetadata::NoIntVersion)
+ RefPtr<IDBDatabaseBackendImpl> databaseBackend = IDBDatabaseBackendImpl::create(name, backingStore.get(), m_transactionCoordinator.get(), this, uniqueIdentifier);
+ if (databaseBackend) {
+ m_databaseBackendMap.set(uniqueIdentifier, databaseBackend.get());
databaseBackend->openConnection(callbacks);
- else
- databaseBackend->openConnectionWithVersion(callbacks, version);
+ } else
+ callbacks->onError(IDBDatabaseError::create(IDBDatabaseException::UNKNOWN_ERR, "Internal error."));
}
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.cpp 2012-08-03 01:32:28 UTC (rev 124545)
@@ -234,7 +234,7 @@
}
}
-bool IDBLevelDBBackingStore::getIDBDatabaseMetaData(const String& name, String& foundStringVersion, int64_t& foundIntVersion, int64_t& foundId)
+bool IDBLevelDBBackingStore::getIDBDatabaseMetaData(const String& name, String& foundVersion, int64_t& foundId)
{
const Vector<char> key = DatabaseNameKey::encode(m_identifier, name);
@@ -242,7 +242,7 @@
if (!ok)
return false;
- ok = getString(m_db.get(), DatabaseMetaDataKey::encode(foundId, DatabaseMetaDataKey::UserVersion), foundStringVersion);
+ ok = getString(m_db.get(), DatabaseMetaDataKey::encode(foundId, DatabaseMetaDataKey::UserVersion), foundVersion);
if (!ok)
return false;
@@ -264,7 +264,7 @@
return databaseId;
}
-bool IDBLevelDBBackingStore::createIDBDatabaseMetaData(const String& name, const String& version, int64_t intVersion, int64_t& rowId)
+bool IDBLevelDBBackingStore::createIDBDatabaseMetaData(const String& name, const String& version, int64_t& rowId)
{
rowId = getNewDatabaseId(m_db.get());
if (rowId < 0)
@@ -278,12 +278,6 @@
return true;
}
-bool IDBLevelDBBackingStore::updateIDBDatabaseIntVersion(int64_t rowId, int64_t intVersion)
-{
- // FIXME: Make this actually do something. http://wkb.ug/92883
- return true;
-}
-
bool IDBLevelDBBackingStore::updateIDBDatabaseMetaData(int64_t rowId, const String& version)
{
ASSERT(m_currentTransaction);
@@ -311,8 +305,7 @@
int64_t databaseId;
String version;
- int64_t intVersion;
- if (!getIDBDatabaseMetaData(name, version, intVersion, databaseId)) {
+ if (!getIDBDatabaseMetaData(name, version, databaseId)) {
transaction->rollback();
return true;
}
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.h (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.h 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBLevelDBBackingStore.h 2012-08-03 01:32:28 UTC (rev 124545)
@@ -45,10 +45,9 @@
virtual ~IDBLevelDBBackingStore();
virtual void getDatabaseNames(Vector<String>& foundNames);
- virtual bool getIDBDatabaseMetaData(const String& name, String& foundVersion, int64_t& foundIntVersion, int64_t& foundId);
- virtual bool createIDBDatabaseMetaData(const String& name, const String& version, int64_t intVersion, int64_t& rowId);
+ virtual bool getIDBDatabaseMetaData(const String& name, String& foundVersion, int64_t& foundId);
+ virtual bool createIDBDatabaseMetaData(const String& name, const String& version, int64_t& rowId);
virtual bool updateIDBDatabaseMetaData(int64_t rowId, const String& version);
- virtual bool updateIDBDatabaseIntVersion(int64_t rowId, int64_t intVersion);
virtual bool deleteDatabase(const String& name);
virtual void getObjectStores(int64_t databaseId, Vector<int64_t>& foundIds, Vector<String>& foundNames, Vector<IDBKeyPath>& foundKeyPaths, Vector<bool>& foundAutoIncrementFlags);
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp (124544 => 124545)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransactionBackendImpl.cpp 2012-08-03 01:32:28 UTC (rev 124545)
@@ -227,8 +227,6 @@
else
m_callbacks->onAbort();
- m_database->transactionFinishedAndEventsFired(this);
-
m_database = 0;
}
Modified: trunk/Source/WebKit/chromium/ChangeLog (124544 => 124545)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-08-03 01:32:28 UTC (rev 124545)
@@ -1,3 +1,16 @@
+2012-08-02 Sheriff Bot <[email protected]>
+
+ Unreviewed, rolling out r124540.
+ http://trac.webkit.org/changeset/124540
+ https://bugs.webkit.org/show_bug.cgi?id=93055
+
+ Broke compile on Chromium Win bot (Requested by dimich on
+ #webkit).
+
+ * tests/IDBAbortOnCorruptTest.cpp:
+ (WebCore::FailingBackingStore::createIDBDatabaseMetaData):
+ * tests/IDBFakeBackingStore.h:
+
2012-08-02 Alexandre Elias <[email protected]>
[chromium] deviceViewportSize cleanup
Modified: trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp (124544 => 124545)
--- trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebKit/chromium/tests/IDBAbortOnCorruptTest.cpp 2012-08-03 01:32:28 UTC (rev 124545)
@@ -74,7 +74,7 @@
{
return adoptRef(new FailingBackingStore);
}
- virtual bool createIDBDatabaseMetaData(const String&, const String&, int64_t, int64_t&)
+ virtual bool createIDBDatabaseMetaData(const String&, const String&, int64_t&)
{
return false;
}
Modified: trunk/Source/WebKit/chromium/tests/IDBFakeBackingStore.h (124544 => 124545)
--- trunk/Source/WebKit/chromium/tests/IDBFakeBackingStore.h 2012-08-03 01:14:59 UTC (rev 124544)
+++ trunk/Source/WebKit/chromium/tests/IDBFakeBackingStore.h 2012-08-03 01:32:28 UTC (rev 124545)
@@ -33,10 +33,9 @@
class IDBFakeBackingStore : public IDBBackingStore {
public:
virtual void getDatabaseNames(Vector<String>& foundNames) OVERRIDE { }
- virtual bool getIDBDatabaseMetaData(const String& name, String& foundVersion, int64_t& foundIntVersion, int64_t& foundId) OVERRIDE { return false; }
- virtual bool createIDBDatabaseMetaData(const String& name, const String& version, const int64_t intVersion, int64_t& rowId) OVERRIDE { return true; }
+ virtual bool getIDBDatabaseMetaData(const String& name, String& foundVersion, int64_t& foundId) OVERRIDE { return false; }
+ virtual bool createIDBDatabaseMetaData(const String& name, const String& version, int64_t& rowId) OVERRIDE { return true; }
virtual bool updateIDBDatabaseMetaData(int64_t rowId, const String& version) OVERRIDE { return false; }
- virtual bool updateIDBDatabaseIntVersion(int64_t rowId, int64_t version) OVERRIDE { return false; }
virtual bool deleteDatabase(const String& name) OVERRIDE { return false; }
virtual void getObjectStores(int64_t databaseId, Vector<int64_t>& foundIds, Vector<String>& foundNames, Vector<IDBKeyPath>& foundKeyPaths, Vector<bool>& foundAutoIncrementFlags) OVERRIDE { }