Minor IndexedDB refactorings.

third_party/WebKit/Source/modules/indexeddb/IDBRequest.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 305 matching lines @@
     ackReceivedBlobs(value.get());
 
     if (m_pendingCursor) {
         // Value should be null, signifying the end of the cursor's range.
         ASSERT(value->isNull());
         ASSERT(!value->blobInfo()->size());
         m_pendingCursor->close();
         m_pendingCursor.clear();
     }
 
 #if ENABLE(ASSERT)

[cmumford, 2016/09/19 23:26:48]

If switching to DCHECK should you also switch to:

  #if DCHECK_IS_ON()

[pwnall, 2016/09/20 09:11:14]

Done.

I also did a bunch more ASSERT->DCHECK changes. It seemed fitting for a
refactoring CL.

     if (value->primaryKey()) {
-        ASSERT(value->keyPath() == effectiveObjectStore(m_source)->metadata().keyPath);
+        DCHECK(value->keyPath() == effectiveObjectStore(m_source)->idbKeyPath());
         assertPrimaryKeyValidOrInjectable(m_scriptState.get(), value.get());
     }
 #endif
 
     onSuccessInternal(IDBAny::create(value.release()));
 }
 
 void IDBRequest::onSuccess(int64_t value)
 {
     IDB_TRACE("IDBRequest::onSuccess(int64_t)");
@@ skipping 74 matching lines @@
 ExecutionContext* IDBRequest::getExecutionContext() const
 {
     return ActiveDOMObject::getExecutionContext();
 }
 
 DispatchEventResult IDBRequest::dispatchEventInternal(Event* event)
 {
     IDB_TRACE("IDBRequest::dispatchEvent");
     if (m_contextStopped || !getExecutionContext())
         return DispatchEventResult::CanceledBeforeDispatch;
-    ASSERT(m_readyState == PENDING);
-    ASSERT(m_hasPendingActivity);
-    ASSERT(m_enqueuedEvents.size());
-    ASSERT(event->target() == this);
+    DCHECK_EQ(m_readyState, PENDING);
+    DCHECK(m_hasPendingActivity);
+    DCHECK(m_enqueuedEvents.size());
+    DCHECK_EQ(event->target(), this);
 
     ScriptState::Scope scope(m_scriptState.get());
 
     if (event->type() != EventTypeNames::blocked)
         m_readyState = DONE;
     dequeueEvent(event);
 
     HeapVector<Member<EventTarget>> targets;
     targets.append(this);
     if (m_transaction && !m_preventPropagation) {
         targets.append(m_transaction);
         // If there ever are events that are associated with a database but
         // that do not have a transaction, then this will not work and we need
         // this object to actually hold a reference to the database (to ensure
         // it stays alive).
         targets.append(m_transaction->db());
     }
 
     // Cursor properties should not be updated until the success event is being dispatched.
     IDBCursor* cursorToNotify = nullptr;
     if (event->type() == EventTypeNames::success) {
         cursorToNotify = getResultCursor();
         if (cursorToNotify)
             cursorToNotify->setValueReady(m_cursorKey.release(), m_cursorPrimaryKey.release(), m_cursorValue.release());
     }
 
     if (event->type() == EventTypeNames::upgradeneeded) {
-        ASSERT(!m_didFireUpgradeNeededEvent);
+        DCHECK(!m_didFireUpgradeNeededEvent);
         m_didFireUpgradeNeededEvent = true;
     }
 
     // FIXME: When we allow custom event dispatching, this will probably need to change.
     DCHECK(event->type() == EventTypeNames::success || event->type() == EventTypeNames::error || event->type() == EventTypeNames::blocked || event->type() == EventTypeNames::upgradeneeded) << "event type was " << event->type();
     const bool setTransactionActive = m_transaction && (event->type() == EventTypeNames::success || event->type() == EventTypeNames::upgradeneeded || (event->type() == EventTypeNames::error && !m_requestAborted));
 
     if (setTransactionActive)
         m_transaction->setActive(true);
 
@@ skipping 70 matching lines @@
 
 void IDBRequest::dequeueEvent(Event* event)
 {
     for (size_t i = 0; i < m_enqueuedEvents.size(); ++i) {
         if (m_enqueuedEvents[i].get() == event)
             m_enqueuedEvents.remove(i);
     }
 }
 
 } // namespace blink