Align IndexedDB metadata rollback on transaction abort to spec.

third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h

 /*
  * 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 48 matching lines @@
   USING_GARBAGE_COLLECTED_MIXIN(IDBDatabase);
   DEFINE_WRAPPERTYPEINFO();
 
  public:
   static IDBDatabase* create(ExecutionContext*,
                              std::unique_ptr<WebIDBDatabase>,
                              IDBDatabaseCallbacks*);
   ~IDBDatabase() override;
   DECLARE_VIRTUAL_TRACE();
 
-  void setMetadata(const IDBDatabaseMetadata& metadata) {
-    m_metadata = metadata;
-  }
-  void indexCreated(int64_t objectStoreId, const IDBIndexMetadata&);
-  void indexDeleted(int64_t objectStoreId, int64_t indexId);
-  void indexRenamed(int64_t objectStoreId,
-                    int64_t indexId,
-                    const String& newName);
+  // Overwrites the database metadata, including object store and index
+  // metadata.

[jsbell, 2016/10/06 20:01:31]

Can you clarify in the comments why we need both of these? E.g. "Used when
opening the connection" / "Used when aborting an upgrade transaction"

[pwnall, 2016/10/06 22:15:22]

Done.

+  void setMetadata(const IDBDatabaseMetadata&);
+  // Overwrites the database's own metadata, but does not change object store
+  // and index metadata.
+  void setDatabaseMetadata(const IDBDatabaseMetadata&);
   void transactionCreated(IDBTransaction*);
   void transactionFinished(const IDBTransaction*);
   const String& getObjectStoreName(int64_t objectStoreId) const;
 
   // Implement the IDL
   const String& name() const { return m_metadata.name; }
   unsigned long long version() const { return m_metadata.version; }
   DOMStringList* objectStoreNames() const;
 
   IDBObjectStore* createObjectStore(const String& name,
@@ skipping 32 matching lines @@
 
   bool isClosePending() const { return m_closePending; }
   void forceClose();
   const IDBDatabaseMetadata& metadata() const { return m_metadata; }
   void enqueueEvent(Event*);
 
   int64_t findObjectStoreId(const String& name) const;
   bool containsObjectStore(const String& name) const {
     return findObjectStoreId(name) != IDBObjectStoreMetadata::InvalidId;
   }
-  void objectStoreRenamed(int64_t storeId, const String& newName);
+  void renameObjectStore(int64_t storeId, const String& newName);
+  void revertObjectStoreCreation(int64_t objectStoreId);
+  void revertObjectStoreMetadata(RefPtr<IDBObjectStoreMetadata> oldMetadata);
 
   // Will return nullptr if this database is stopped.
   WebIDBDatabase* backend() const { return m_backend.get(); }
 
   static int64_t nextTransactionId();
 
   static const char indexDeletedErrorMessage[];
   static const char indexNameTakenErrorMessage[];
   static const char isKeyCursorErrorMessage[];
   static const char noKeyOrKeyRangeErrorMessage[];
@@ skipping 39 matching lines @@
   // Keep track of the versionchange events waiting to be fired on this
   // database so that we can cancel them if the database closes.
   HeapVector<Member<Event>> m_enqueuedEvents;
 
   Member<IDBDatabaseCallbacks> m_databaseCallbacks;
 };
 
 }  // namespace blink
 
 #endif  // IDBDatabase_h