IndexedDB: Various C++11isms and cleanup

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 60 matching lines @@
 IDBDatabase* IDBDatabase::create(ExecutionContext* context, PassOwnPtr<WebIDBDatabase> database, IDBDatabaseCallbacks* callbacks)
 {
     IDBDatabase* idbDatabase = new IDBDatabase(context, database, callbacks);
     idbDatabase->suspendIfNeeded();
     return idbDatabase;
 }
 
 IDBDatabase::IDBDatabase(ExecutionContext* context, PassOwnPtr<WebIDBDatabase> backend, IDBDatabaseCallbacks* callbacks)
     : ActiveDOMObject(context)
     , m_backend(backend)
-    , m_closePending(false)
-    , m_contextStopped(false)
     , m_databaseCallbacks(callbacks)
 {
     m_databaseCallbacks->connect(this);
 }
 
 IDBDatabase::~IDBDatabase()
 {
     if (!m_closePending && m_backend)
         m_backend->close();
 }
@@ skipping 66 matching lines @@
 
 void IDBDatabase::onComplete(int64_t transactionId)
 {
     ASSERT(m_transactions.contains(transactionId));
     m_transactions.get(transactionId)->onComplete();
 }
 
 PassRefPtrWillBeRawPtr<DOMStringList> IDBDatabase::objectStoreNames() const
 {
     RefPtrWillBeRawPtr<DOMStringList> objectStoreNames = DOMStringList::create(DOMStringList::IndexedDB);
-    for (IDBDatabaseMetadata::ObjectStoreMap::const_iterator it = m_metadata.objectStores.begin(); it != m_metadata.objectStores.end(); ++it)
-        objectStoreNames->append(it->value.name);
+    for (const auto& it : m_metadata.objectStores)
+        objectStoreNames->append(it.value.name);
     objectStoreNames->sort();
     return objectStoreNames.release();
 }
 
 void IDBDatabase::version(UnsignedLongLongOrString& result) const
 {
     if (m_metadata.intVersion == IDBDatabaseMetadata::NoIntVersion)
         result.setString(m_metadata.version);
     else
         result.setUnsignedLongLong(m_metadata.intVersion);
@@ skipping 140 matching lines @@
     }
 
     int64_t transactionId = nextTransactionId();
     m_backend->createTransaction(transactionId, WebIDBDatabaseCallbacksImpl::create(m_databaseCallbacks).leakPtr(), objectStoreIds, mode);
 
     return IDBTransaction::create(scriptState, transactionId, scope, mode, this);
 }
 
 void IDBDatabase::forceClose()
 {
-    for (TransactionMap::const_iterator::Values it = m_transactions.begin().values(), end = m_transactions.end().values(); it != end; ++it)
-        (*it)->abort(IGNORE_EXCEPTION);
+    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;
 
@@ skipping 67 matching lines @@
     }
 
     bool result = EventTarget::dispatchEventInternal(event.get());
     if (event->type() == EventTypeNames::versionchange && !m_closePending && m_backend)
         m_backend->versionChangeIgnored();
     return result;
 }
 
 int64_t IDBDatabase::findObjectStoreId(const String& name) const
 {
-    for (IDBDatabaseMetadata::ObjectStoreMap::const_iterator it = m_metadata.objectStores.begin(); it != m_metadata.objectStores.end(); ++it) {
-        if (it->value.name == name) {
-            ASSERT(it->key != IDBObjectStoreMetadata::InvalidId);
-            return it->key;
+    for (const auto& it : m_metadata.objectStores) {
+        if (it.value.name == name) {
+            ASSERT(it.key != IDBObjectStoreMetadata::InvalidId);
+            return it.key;
         }
     }
     return IDBObjectStoreMetadata::InvalidId;
 }
 
 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 16 matching lines @@
 {
     return EventTargetNames::IDBDatabase;
 }
 
 ExecutionContext* IDBDatabase::executionContext() const
 {
     return ActiveDOMObject::executionContext();
 }
 
 } // namespace blink