Minor IndexedDB refactorings.

third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp

 /*
  * Copyright (C) 2012 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 34 matching lines @@
     request->suspendIfNeeded();
     return request;
 }
 
 IDBOpenDBRequest::IDBOpenDBRequest(ScriptState* scriptState, IDBDatabaseCallbacks* callbacks, int64_t transactionId, int64_t version)
     : IDBRequest(scriptState, IDBAny::createNull(), nullptr)
     , m_databaseCallbacks(callbacks)
     , m_transactionId(transactionId)
     , m_version(version)
 {
-    ASSERT(!resultAsAny());
+    DCHECK(!resultAsAny());
 }
 
 IDBOpenDBRequest::~IDBOpenDBRequest()
 {
 }
 
 DEFINE_TRACE(IDBOpenDBRequest)
 {
     visitor->trace(m_databaseCallbacks);
     IDBRequest::trace(visitor);
@@ skipping 18 matching lines @@
     IDB_TRACE("IDBOpenDBRequest::onUpgradeNeeded()");
     if (m_contextStopped || !getExecutionContext()) {
         std::unique_ptr<WebIDBDatabase> db = std::move(backend);
         db->abort(m_transactionId);
         db->close();
         return;
     }
     if (!shouldEnqueueEvent())
         return;
 
-    ASSERT(m_databaseCallbacks);
+    DCHECK(m_databaseCallbacks);
 
     IDBDatabase* idbDatabase = IDBDatabase::create(getExecutionContext(), std::move(backend), m_databaseCallbacks.release());
     idbDatabase->setMetadata(metadata);
 
     if (oldVersion == IDBDatabaseMetadata::NoVersion) {
         // This database hasn't had a version before.
         oldVersion = IDBDatabaseMetadata::DefaultVersion;
     }
     IDBDatabaseMetadata oldMetadata(metadata);
     oldMetadata.version = oldVersion;
 
-    m_transaction = IDBTransaction::create(getScriptState(), m_transactionId, idbDatabase, this, oldMetadata);
+    m_transaction = IDBTransaction::createVersionChange(getScriptState(), m_transactionId, idbDatabase, this, oldMetadata);
     setResult(IDBAny::create(idbDatabase));
 
     if (m_version == IDBDatabaseMetadata::NoVersion)
         m_version = 1;
     enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::upgradeneeded, oldVersion, m_version, dataLoss, dataLossMessage));
 }
 
 void IDBOpenDBRequest::onSuccess(std::unique_ptr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata)
 {
     IDB_TRACE("IDBOpenDBRequest::onSuccess()");
     if (m_contextStopped || !getExecutionContext()) {
         std::unique_ptr<WebIDBDatabase> db = std::move(backend);
         if (db)
             db->close();
         return;
     }
     if (!shouldEnqueueEvent())
         return;
 
     IDBDatabase* idbDatabase = nullptr;
     if (resultAsAny()) {
         // Previous onUpgradeNeeded call delivered the backend.
-        ASSERT(!backend.get());
+        DCHECK(!backend.get());
         idbDatabase = resultAsAny()->idbDatabase();
-        ASSERT(idbDatabase);
-        ASSERT(!m_databaseCallbacks);
+        DCHECK(idbDatabase);
+        DCHECK(!m_databaseCallbacks);
     } else {
-        ASSERT(backend.get());
-        ASSERT(m_databaseCallbacks);
+        DCHECK(backend.get());
+        DCHECK(m_databaseCallbacks);
         idbDatabase = IDBDatabase::create(getExecutionContext(), std::move(backend), m_databaseCallbacks.release());
         setResult(IDBAny::create(idbDatabase));
     }
     idbDatabase->setMetadata(metadata);
     enqueueEvent(Event::create(EventTypeNames::success));
 }
 
 void IDBOpenDBRequest::onSuccess(int64_t oldVersion)
 {
     IDB_TRACE("IDBOpenDBRequest::onSuccess()");
     if (!shouldEnqueueEvent())
         return;
     if (oldVersion == IDBDatabaseMetadata::NoVersion) {
         // This database hasn't had an integer version before.
         oldVersion = IDBDatabaseMetadata::DefaultVersion;
     }
     setResult(IDBAny::createUndefined());
     enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::success, oldVersion, Nullable<unsigned long long>()));
 }
 
 bool IDBOpenDBRequest::shouldEnqueueEvent() const
 {
     if (m_contextStopped || !getExecutionContext())
         return false;
-    ASSERT(m_readyState == PENDING || m_readyState == DONE);
+    DCHECK(m_readyState == PENDING || m_readyState == DONE);
     if (m_requestAborted)
         return false;
     return true;
 }
 
 DispatchEventResult IDBOpenDBRequest::dispatchEventInternal(Event* event)
 {
     // If the connection closed between onUpgradeNeeded and the delivery of the "success" event,
     // an "error" event should be fired instead.
     if (event->type() == EventTypeNames::success && resultAsAny()->getType() == IDBAny::IDBDatabaseType && resultAsAny()->idbDatabase()->isClosePending()) {
         dequeueEvent(event);
         setResult(nullptr);
         onError(DOMException::create(AbortError, "The connection was closed."));
         return DispatchEventResult::CanceledBeforeDispatch;
     }
 
     return IDBRequest::dispatchEventInternal(event);
 }
 
 } // namespace blink