Align IndexedDB metadata rollback on transaction abort to spec.

third_party/WebKit/Source/modules/indexeddb/IDBIndex.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 27 matching lines @@
 #include "modules/indexeddb/WebIDBCallbacksImpl.h"
 #include "public/platform/modules/indexeddb/WebIDBKeyRange.h"
 #include <memory>
 
 using blink::WebIDBCallbacks;
 using blink::WebIDBCursor;
 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);
 }
 
 IDBIndex::~IDBIndex() {}
 
 DEFINE_TRACE(IDBIndex) {
   visitor->trace(m_objectStore);
   visitor->trace(m_transaction);
 }
 
@@ skipping 32 matching lines @@
     return;
   }
   if (!backendDB()) {
     exceptionState.throwDOMException(InvalidStateError,
                                      IDBDatabase::databaseClosedErrorMessage);
     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,
                                  ExceptionState& exceptionState) {
   IDB_TRACE("IDBIndex::openCursor");
   if (isDeleted()) {
     exceptionState.throwDOMException(InvalidStateError,
                                      IDBDatabase::indexDeletedErrorMessage);
     return nullptr;
   }
@@ skipping 240 matching lines @@
   backendDB()->getAll(m_transaction->id(), m_objectStore->id(), id(), keyRange,
                       maxCount, keyOnly,
                       WebIDBCallbacksImpl::create(request).release());
   return request;
 }
 
 WebIDBDatabase* IDBIndex::backendDB() const {
   return m_transaction->backendDB();
 }
 
-bool IDBIndex::isDeleted() const {
-  return m_deleted || m_objectStore->isDeleted();
-}
-
 }  // namespace blink