Minor IndexedDB refactorings.

third_party/WebKit/Source/modules/indexeddb/IDBDatabase.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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 112 matching lines @@
     it->value.indexes.remove(indexId);
 }
 
 void IDBDatabase::indexRenamed(int64_t objectStoreId, int64_t indexId, const String& newName)
 {
     IDBDatabaseMetadata::ObjectStoreMap::iterator storeIterator = m_metadata.objectStores.find(objectStoreId);
     SECURITY_DCHECK(storeIterator != m_metadata.objectStores.end());
 
     IDBObjectStoreMetadata& storeMetadata = storeIterator->value;
     IDBObjectStoreMetadata::IndexMap::iterator indexIterator = storeMetadata.indexes.find(indexId);
-    DCHECK(indexIterator != storeMetadata.indexes.end());
+    DCHECK_NE(indexIterator, storeMetadata.indexes.end());
     indexIterator->value.name = newName;
 }
 
 void IDBDatabase::transactionCreated(IDBTransaction* transaction)
 {
-    ASSERT(transaction);
-    ASSERT(!m_transactions.contains(transaction->id()));
+    DCHECK(transaction);
+    DCHECK(!m_transactions.contains(transaction->id()));
     m_transactions.add(transaction->id(), transaction);
 
     if (transaction->isVersionChange()) {
-        ASSERT(!m_versionChangeTransaction);
+        DCHECK(!m_versionChangeTransaction);
         m_versionChangeTransaction = transaction;
     }
 }
 
 void IDBDatabase::transactionFinished(const IDBTransaction* transaction)
 {
-    ASSERT(transaction);
-    ASSERT(m_transactions.contains(transaction->id()));
-    ASSERT(m_transactions.get(transaction->id()) == transaction);
+    DCHECK(transaction);
+    DCHECK(m_transactions.contains(transaction->id()));
+    DCHECK_EQ(m_transactions.get(transaction->id()), transaction);
     m_transactions.remove(transaction->id());
 
     if (transaction->isVersionChange()) {
-        ASSERT(m_versionChangeTransaction == transaction);
+        DCHECK_EQ(m_versionChangeTransaction, transaction);
         m_versionChangeTransaction = nullptr;
     }
 
     if (m_closePending && m_transactions.isEmpty())
         closeConnection();
 }
 
 void IDBDatabase::onAbort(int64_t transactionId, DOMException* error)
 {
-    ASSERT(m_transactions.contains(transactionId));
+    DCHECK(m_transactions.contains(transactionId));
     m_transactions.get(transactionId)->onAbort(error);
 }
 
 void IDBDatabase::onComplete(int64_t transactionId)
 {
-    ASSERT(m_transactions.contains(transactionId));
+    DCHECK(m_transactions.contains(transactionId));
     m_transactions.get(transactionId)->onComplete();
 }
 
 DOMStringList* IDBDatabase::objectStoreNames() const
 {
     DOMStringList* objectStoreNames = DOMStringList::create(DOMStringList::IndexedDB);
     for (const auto& it : m_metadata.objectStores)
         objectStoreNames->append(it.value.name);
     objectStoreNames->sort();
     return objectStoreNames;
@@ skipping 98 matching lines @@
     if (storeNames.isString()) {
         scope.add(storeNames.getAsString());
     } else if (storeNames.isStringSequence()) {
         for (const String& name : storeNames.getAsStringSequence())
             scope.add(name);
     } else if (storeNames.isDOMStringList()) {
         const Vector<String>& list = *storeNames.getAsDOMStringList();
         for (const String& name : list)
             scope.add(name);
     } else {
-        ASSERT_NOT_REACHED();
+        NOTREACHED();
     }
 
     if (m_versionChangeTransaction) {
         exceptionState.throwDOMException(InvalidStateError, "A version change transaction is running.");
         return nullptr;
     }
 
     if (m_closePending) {
         exceptionState.throwDOMException(InvalidStateError, "The database connection is closing.");
         return nullptr;
     }
 
     if (!m_backend) {
         exceptionState.throwDOMException(InvalidStateError, IDBDatabase::databaseClosedErrorMessage);
         return nullptr;
     }
 
-
     if (scope.isEmpty()) {
         exceptionState.throwDOMException(InvalidAccessError, "The storeNames parameter was empty.");
         return nullptr;
     }
 
     Vector<int64_t> objectStoreIds;
     for (const String& name : scope) {
         int64_t objectStoreId = findObjectStoreId(name);
         if (objectStoreId == IDBObjectStoreMetadata::InvalidId) {
             exceptionState.throwDOMException(NotFoundError, "One of the specified object stores was not found.");
             return nullptr;
         }
         objectStoreIds.append(objectStoreId);
     }
 
     WebIDBTransactionMode mode = IDBTransaction::stringToMode(modeString);
     if (mode != WebIDBTransactionModeReadOnly && mode != WebIDBTransactionModeReadWrite) {
         exceptionState.throwTypeError("The mode provided ('" + modeString + "') is not one of 'readonly' or 'readwrite'.");
         return nullptr;
     }
 
     int64_t transactionId = nextTransactionId();
     m_backend->createTransaction(transactionId, WebIDBDatabaseCallbacksImpl::create(m_databaseCallbacks).release(), objectStoreIds, mode);
 
-    return IDBTransaction::create(scriptState, transactionId, scope, mode, this);
+    return IDBTransaction::createNonVersionChange(scriptState, transactionId, scope, mode, this);
 }
 
 void IDBDatabase::forceClose()
 {
     for (const auto& it : m_transactions)
         it.value->abort(IGNORE_EXCEPTION);
     this->close();
     enqueueEvent(Event::create(EventTypeNames::close));
 }
 
 void IDBDatabase::close()
 {
     IDB_TRACE("IDBDatabase::close");
     if (m_closePending)
         return;
 
     m_closePending = true;
 
     if (m_transactions.isEmpty())
         closeConnection();
 }
 
 void IDBDatabase::closeConnection()
 {
-    ASSERT(m_closePending);
-    ASSERT(m_transactions.isEmpty());
+    DCHECK(m_closePending);
+    DCHECK(m_transactions.isEmpty());
 
     if (m_backend) {
         m_backend->close();
         m_backend.reset();
     }
 
     if (m_contextStopped || !getExecutionContext())
         return;
 
     EventQueue* eventQueue = getExecutionContext()->getEventQueue();
@@ skipping 20 matching lines @@
         m_backend->versionChangeIgnored();
         return;
     }
 
     Nullable<unsigned long long> newVersionNullable = (newVersion == IDBDatabaseMetadata::NoVersion) ? Nullable<unsigned long long>() : Nullable<unsigned long long>(newVersion);
     enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::versionchange, oldVersion, newVersionNullable));
 }
 
 void IDBDatabase::enqueueEvent(Event* event)
 {
-    ASSERT(!m_contextStopped);
-    ASSERT(getExecutionContext());
+    DCHECK(!m_contextStopped);
+    DCHECK(getExecutionContext());
     EventQueue* eventQueue = getExecutionContext()->getEventQueue();
     event->setTarget(this);
     eventQueue->enqueueEvent(event);
     m_enqueuedEvents.append(event);
 }
 
 DispatchEventResult IDBDatabase::dispatchEventInternal(Event* event)
 {
     IDB_TRACE("IDBDatabase::dispatchEvent");
     if (m_contextStopped || !getExecutionContext())
         return DispatchEventResult::CanceledBeforeDispatch;
-    ASSERT(event->type() == EventTypeNames::versionchange || event->type() == EventTypeNames::close);
+    DCHECK(event->type() == EventTypeNames::versionchange || event->type() == EventTypeNames::close);
     for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
         if (m_enqueuedEvents[i].get() == event)
             m_enqueuedEvents.remove(i);
     }
 
     DispatchEventResult dispatchResult = EventTarget::dispatchEventInternal(event);
     if (event->type() == EventTypeNames::versionchange && !m_closePending && m_backend)
         m_backend->versionChangeIgnored();
     return dispatchResult;
 }
 
 int64_t IDBDatabase::findObjectStoreId(const String& name) const
 {
     for (const auto& it : m_metadata.objectStores) {
         if (it.value.name == name) {
-            ASSERT(it.key != IDBObjectStoreMetadata::InvalidId);
+            DCHECK_NE(it.key, IDBObjectStoreMetadata::InvalidId);
             return it.key;
         }
     }
     return IDBObjectStoreMetadata::InvalidId;
 }
 
-void IDBDatabase::objectStoreRenamed(int64_t storeId, const String& newName)
+void IDBDatabase::objectStoreRenamed(int64_t objectStoreId, const String& newName)
 {
-    DCHECK(m_metadata.objectStores.contains(storeId));
-    IDBDatabaseMetadata::ObjectStoreMap::iterator it = m_metadata.objectStores.find(storeId);
+    DCHECK(m_versionChangeTransaction) << "Object store renamed on database without a versionchange transaction";
+    DCHECK(m_versionChangeTransaction->isActive()) << "Object store renamed when versionchange transaction is not active";
+    DCHECK(m_backend) << "Object store renamed after database connection closed";
+    DCHECK(m_metadata.objectStores.contains(objectStoreId));
+    IDBDatabaseMetadata::ObjectStoreMap::iterator it = m_metadata.objectStores.find(objectStoreId);
     it->value.name = newName;
 }
 
 bool IDBDatabase::hasPendingActivity() const
 {
     // The script wrapper must not be collected before the object is closed or
     // we can't fire a "versionchange" event to let script manually close the connection.
     return !m_closePending && hasEventListeners() && !m_contextStopped;
 }
 
@@ skipping 20 matching lines @@
     return ActiveDOMObject::getExecutionContext();
 }
 
 void IDBDatabase::recordApiCallsHistogram(IndexedDatabaseMethods method)
 {
     DEFINE_THREAD_SAFE_STATIC_LOCAL(EnumerationHistogram, apiCallsHistogram, new EnumerationHistogram("WebCore.IndexedDB.FrontEndAPICalls", IDBMethodsMax));
     apiCallsHistogram.count(method);
 }
 
 } // namespace blink