Align IndexedDB metadata rollback on transaction abort to spec.

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

Index: third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp
index c0c93bb67abf5ab45c928e3270436578f997909c..ce580c2e5411e7d47b9c6da48bd0b3a3b70ac9dc 100644
--- a/third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBIndex.cpp
@@ -45,14 +45,15 @@ using blink::WebIDBDatabase;
 
 namespace blink {
 
-IDBIndex::IDBIndex(const IDBIndexMetadata& metadata,
+IDBIndex::IDBIndex(RefPtr<IDBIndexMetadata> metadata,
                    IDBObjectStore* objectStore,
                    IDBTransaction* transaction)
-    : m_metadata(metadata),
+    : m_metadata(std::move(metadata)),
       m_objectStore(objectStore),
       m_transaction(transaction) {
   DCHECK(m_objectStore);
   DCHECK(m_transaction);
+  DCHECK(m_metadata.get());
   DCHECK_NE(id(), IDBIndexMetadata::InvalidId);
 }
 
@@ -103,17 +104,21 @@ void IDBIndex::setName(const String& name, ExceptionState& exceptionState) {
     return;
   }
 
-  backendDB()->renameIndex(m_transaction->id(), m_objectStore->id(), id(),
-                           name);
-  m_metadata.name = name;
-  m_objectStore->indexRenamed(m_metadata.id, name);
-  m_transaction->db()->indexRenamed(m_objectStore->id(), id(), name);
+  m_objectStore->renameIndex(id(), name);
 }
 
 ScriptValue IDBIndex::keyPath(ScriptState* scriptState) const {
   return ScriptValue::from(scriptState, metadata().keyPath);
 }
 
+void IDBIndex::revertMetadata(RefPtr<IDBIndexMetadata> oldMetadata) {
+  m_metadata = std::move(oldMetadata);
+
+  // An index's metadata will only get reverted if the index was in the
+  // database when the versionchange transaction started.
+  m_deleted = false;
+}
+
 IDBRequest* IDBIndex::openCursor(ScriptState* scriptState,
                                  const ScriptValue& range,
                                  const String& directionString,
@@ -374,8 +379,4 @@ WebIDBDatabase* IDBIndex::backendDB() const {
   return m_transaction->backendDB();
 }
 
-bool IDBIndex::isDeleted() const {
-  return m_deleted || m_objectStore->isDeleted();
-}
-
 }  // namespace blink