diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:32:40 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:32:40 +0200 |
| commit | 2d33b998c72d57abcde836bd2985ad72265d9697 (patch) | |
| tree | 7e6cb902694ac348b6b785a14a997451d0b80951 /dom/indexedDB/KeyPath.h | |
| parent | 47f4227deac7db16fbb8f4aec0376f552fc296b5 (diff) | |
| parent | 9fdff854ebf1fe1a118061d57fd0a2d6c5c7dfd7 (diff) | |
| download | UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.gz UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.lz UXP-2d33b998c72d57abcde836bd2985ad72265d9697.tar.xz UXP-2d33b998c72d57abcde836bd2985ad72265d9697.zip | |
Merge branch 'release' into Pale_Moon-release
# Conflicts:
# application/palemoon/config/version.txt
Diffstat (limited to 'dom/indexedDB/KeyPath.h')
| -rw-r--r-- | dom/indexedDB/KeyPath.h | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/dom/indexedDB/KeyPath.h b/dom/indexedDB/KeyPath.h index c133cdc4a..e6e5f57d4 100644 --- a/dom/indexedDB/KeyPath.h +++ b/dom/indexedDB/KeyPath.h @@ -72,7 +72,10 @@ public: Parse(const Nullable<OwningStringOrStringSequence>& aValue, KeyPath* aKeyPath); nsresult - ExtractKey(JSContext* aCx, const JS::Value& aValue, Key& aKey) const; + ExtractKey(JSContext* aCx, + const JS::Value& aValue, + Key& aKey, + bool aCallGetters) const; nsresult ExtractKeyAsJSVal(JSContext* aCx, const JS::Value& aValue, @@ -82,9 +85,12 @@ public: (*ExtractOrCreateKeyCallback)(JSContext* aCx, void* aClosure); nsresult - ExtractOrCreateKey(JSContext* aCx, const JS::Value& aValue, Key& aKey, + ExtractOrCreateKey(JSContext* aCx, + const JS::Value& aValue, + Key& aKey, ExtractOrCreateKeyCallback aCallback, - void* aClosure) const; + void* aClosure, + bool aCallGetters) const; inline bool IsValid() const { return mType != NONEXISTENT; |