Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(663)

Unified Diff: third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp

Issue 2349413002: Minor IndexedDB refactorings. (Closed)
Patch Set: Rebased Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
index 9be4f6b841f3de036df3f91fb97889ee27c4c58d..0e0e4d7bbc3736348539d490c2c6be486c5f0c33 100644
--- a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
@@ -52,7 +52,7 @@ IDBOpenDBRequest::IDBOpenDBRequest(ScriptState* scriptState, IDBDatabaseCallback
, m_transactionId(transactionId)
, m_version(version)
{
- ASSERT(!resultAsAny());
+ DCHECK(!resultAsAny());
}
IDBOpenDBRequest::~IDBOpenDBRequest()
@@ -91,7 +91,7 @@ void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<WebID
if (!shouldEnqueueEvent())
return;
- ASSERT(m_databaseCallbacks);
+ DCHECK(m_databaseCallbacks);
IDBDatabase* idbDatabase = IDBDatabase::create(getExecutionContext(), std::move(backend), m_databaseCallbacks.release());
idbDatabase->setMetadata(metadata);
@@ -103,7 +103,7 @@ void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<WebID
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)
@@ -126,13 +126,13 @@ void IDBOpenDBRequest::onSuccess(std::unique_ptr<WebIDBDatabase> backend, const
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));
}
@@ -157,7 +157,7 @@ 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;

Powered by Google App Engine
This is Rietveld 408576698