Bug 934640 - Add database version to database file managers; r=dom-storage-reviewers,jari

Differential Revision: https://phabricator.services.mozilla.com/D190052

dom/indexedDB/ActorsParent.cpp

@@ -11716,6 +11716,7 @@ DatabaseFileManager::DatabaseFileManager(
           aIsInPrivateBrowsingMode
               ? new IndexedDBCipherKeyManager("IndexedDBCipherKeyManager")
               : nullptr),
+      mDatabaseVersion(0),
       mEnforcingQuota(aEnforcingQuota),
       mIsInPrivateBrowsingMode(aIsInPrivateBrowsingMode) {}
 
@@ -15852,6 +15853,8 @@ void OpenDatabaseOp::SendResults() {
       // need to update the version in our metadata.
       mMetadata->mCommonMetadata.version() = mRequestedVersion;
 
+      mFileManager->UpdateDatabaseVersion(mRequestedVersion);
+
       nsresult rv = EnsureDatabaseActorIsAlive();
       if (NS_SUCCEEDED(rv)) {
         // We successfully opened a database so use its actor as the success

dom/indexedDB/DatabaseFileManager.h

@@ -38,6 +38,8 @@ class DatabaseFileManager final
   LazyInitializedOnce<const nsString> mDirectoryPath;
   LazyInitializedOnce<const nsString> mJournalDirectoryPath;
 
+  uint64_t mDatabaseVersion;
+
   const bool mEnforcingQuota;
   const bool mIsInPrivateBrowsingMode;
 
@@ -87,6 +89,12 @@ class DatabaseFileManager final
 
   const nsAString& DatabaseFilePath() const { return mDatabaseFilePath; }
 
+  uint64_t DatabaseVersion() const { return mDatabaseVersion; }
+
+  void UpdateDatabaseVersion(uint64_t aDatabaseVersion) {
+    mDatabaseVersion = aDatabaseVersion;
+  }
+
   IndexedDBCipherKeyManager& MutableCipherKeyManagerRef() const {
     MOZ_ASSERT(mIsInPrivateBrowsingMode);
     MOZ_ASSERT(mCipherKeyManager);