From 83f211d36f2dde02fbabe1af4805248db6ef2586 Mon Sep 17 00:00:00 2001
From: Jari Jalkanen <jjalkanen@mozilla.com>
Date: Mon, 22 Apr 2024 04:46:59 +0000
Subject: [PATCH] Bug 1890730 - Fix IDBFactory deleteDatabase to not use
 IDBOpenDBOptions. r=dom-storage-reviewers,webidl,smaug,asuth

Differential Revision: https://phabricator.services.mozilla.com/D207168
---
 devtools/shared/indexed-db.js   | 3 ---
 dom/indexedDB/IDBFactory.cpp    | 7 ++++---
 dom/indexedDB/IDBFactory.h      | 7 ++++---
 dom/webidl/IDBFactory.webidl    | 3 +--
 tools/@types/lib.gecko.dom.d.ts | 2 +-
 5 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/devtools/shared/indexed-db.js b/devtools/shared/indexed-db.js
index 2dda1f808480..23d75116005c 100644
--- a/devtools/shared/indexed-db.js
+++ b/devtools/shared/indexed-db.js
@@ -35,9 +35,6 @@ module.exports = Object.freeze({
     return indexedDB.openForPrincipal(principal, name, options);
   },
 
-  /**
-   * Only the standard version of indexedDB.deleteDatabase is supported.
-   */
   deleteDatabase(name) {
     return indexedDB.deleteForPrincipal(principal, name);
   },
diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp
index e93990cb9333..ee30b123fd4b 100644
--- a/dom/indexedDB/IDBFactory.cpp
+++ b/dom/indexedDB/IDBFactory.cpp
@@ -391,9 +391,10 @@ RefPtr<IDBOpenDBRequest> IDBFactory::Open(JSContext* aCx,
                       /* aDeleting */ false, aCallerType, aRv);
 }
 
-RefPtr<IDBOpenDBRequest> IDBFactory::DeleteDatabase(
-    JSContext* aCx, const nsAString& aName, const IDBOpenDBOptions& aOptions,
-    CallerType aCallerType, ErrorResult& aRv) {
+RefPtr<IDBOpenDBRequest> IDBFactory::DeleteDatabase(JSContext* aCx,
+                                                    const nsAString& aName,
+                                                    CallerType aCallerType,
+                                                    ErrorResult& aRv) {
   return OpenInternal(aCx,
                       /* aPrincipal */ nullptr, aName, Optional<uint64_t>(),
                       /* aDeleting */ true, aCallerType, aRv);
diff --git a/dom/indexedDB/IDBFactory.h b/dom/indexedDB/IDBFactory.h
index ff8c9c3fb023..6d71acf8db5d 100644
--- a/dom/indexedDB/IDBFactory.h
+++ b/dom/indexedDB/IDBFactory.h
@@ -151,9 +151,10 @@ class IDBFactory final : public GlobalTeardownObserver, public nsWrapperCache {
       const Optional<uint64_t>& aVersion, CallerType aCallerType,
       ErrorResult& aRv);
 
-  [[nodiscard]] RefPtr<IDBOpenDBRequest> DeleteDatabase(
-      JSContext* aCx, const nsAString& aName, const IDBOpenDBOptions& aOptions,
-      CallerType aCallerType, ErrorResult& aRv);
+  [[nodiscard]] RefPtr<IDBOpenDBRequest> DeleteDatabase(JSContext* aCx,
+                                                        const nsAString& aName,
+                                                        CallerType aCallerType,
+                                                        ErrorResult& aRv);
 
   already_AddRefed<Promise> Databases(JSContext* aCx);
 
diff --git a/dom/webidl/IDBFactory.webidl b/dom/webidl/IDBFactory.webidl
index fc4fb655accf..8b17cc4a9c79 100644
--- a/dom/webidl/IDBFactory.webidl
+++ b/dom/webidl/IDBFactory.webidl
@@ -31,8 +31,7 @@ interface IDBFactory {
 
   [NewObject, Throws, NeedsCallerType]
   IDBOpenDBRequest
-  deleteDatabase(DOMString name,
-                 optional IDBOpenDBOptions options = {});
+  deleteDatabase(DOMString name);
 
   Promise<sequence<IDBDatabaseInfo>> databases();
 
diff --git a/tools/@types/lib.gecko.dom.d.ts b/tools/@types/lib.gecko.dom.d.ts
index 115ad529d5ca..bb1e11010494 100644
--- a/tools/@types/lib.gecko.dom.d.ts
+++ b/tools/@types/lib.gecko.dom.d.ts
@@ -17902,7 +17902,7 @@ interface IDBFactory {
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBFactory/cmp) */
     cmp(first: any, second: any): number;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBFactory/deleteDatabase) */
-    deleteDatabase(name: string, options?: IDBOpenDBOptions): IDBOpenDBRequest;
+    deleteDatabase(name: string): IDBOpenDBRequest;
     deleteForPrincipal(principal: Principal, name: string, options?: IDBOpenDBOptions): IDBOpenDBRequest;
     /** [MDN Reference](https://developer.mozilla.org/docs/Web/API/IDBFactory/open) */
     open(name: string, version?: number): IDBOpenDBRequest;