From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 dom/indexedDB/KeyPath.h | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'dom/indexedDB/KeyPath.h')

diff --git a/dom/indexedDB/KeyPath.h b/dom/indexedDB/KeyPath.h
index 4e1042650f..5fac30ecf8 100644
--- a/dom/indexedDB/KeyPath.h
+++ b/dom/indexedDB/KeyPath.h
@@ -45,6 +45,8 @@ class KeyPath {
   KeyPath() : mType(KeyPathType::NonExistent) { MOZ_COUNT_CTOR(KeyPath); }
 
  public:
+  using VoidOrObjectStoreKeyPathString = nsAString;
+
   enum class KeyPathType { NonExistent, String, Array, EndGuard };
 
   void SetType(KeyPathType aType);
@@ -76,7 +78,10 @@ class KeyPath {
   static Result<KeyPath, nsresult> Parse(
       const Nullable<OwningStringOrStringSequence>& aValue);
 
-  nsresult ExtractKey(JSContext* aCx, const JS::Value& aValue, Key& aKey) const;
+  nsresult ExtractKey(
+      JSContext* aCx, const JS::Value& aValue, Key& aKey,
+      const VoidOrObjectStoreKeyPathString& aAutoIncrementedObjectStoreKeyPath =
+          VoidString()) const;
 
   nsresult ExtractKeyAsJSVal(JSContext* aCx, const JS::Value& aValue,
                              JS::Value* aOutVal) const;
-- 
cgit v1.2.3