diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:31:35 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-09-06 10:31:35 +0200 |
| commit | 0f7f961e8894c8408b7fa21bbeba7ac503d372eb (patch) | |
| tree | 033c37b3e8ca856d8b35d2408afa5269f0237078 /dom/indexedDB/Key.h | |
| parent | dba27e6f639954060b9353c6d8f594eab0e06a99 (diff) | |
| parent | 6db06749e2037029adc96660aafa5339ed609e60 (diff) | |
| download | UXP-2019.09.12.tar UXP-2019.09.12.tar.gz UXP-2019.09.12.tar.lz UXP-2019.09.12.tar.xz UXP-2019.09.12.zip | |
Merge branch 'master' into Basilisk-releasev2019.09.12
Diffstat (limited to 'dom/indexedDB/Key.h')
| -rw-r--r-- | dom/indexedDB/Key.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/dom/indexedDB/Key.h b/dom/indexedDB/Key.h index 9d70ce6ad..a4fb65b48 100644 --- a/dom/indexedDB/Key.h +++ b/dom/indexedDB/Key.h @@ -203,7 +203,7 @@ public: } nsresult - SetFromJSVal(JSContext* aCx, JS::Handle<JS::Value> aVal); + SetFromJSVal(JSContext* aCx, JS::Handle<JS::Value> aVal, bool aCallGetters); nsresult ToJSVal(JSContext* aCx, JS::MutableHandle<JS::Value> aVal) const; @@ -212,7 +212,10 @@ public: ToJSVal(JSContext* aCx, JS::Heap<JS::Value>& aVal) const; nsresult - AppendItem(JSContext* aCx, bool aFirstOfArray, JS::Handle<JS::Value> aVal); + AppendItem(JSContext* aCx, + bool aFirstOfArray, + JS::Handle<JS::Value> aVal, + bool aCallGetters); nsresult ToLocaleBasedKey(Key& aTarget, const nsCString& aLocale) const; @@ -283,7 +286,10 @@ private: // Encoding functions. These append the encoded value to the end of mBuffer nsresult - EncodeJSVal(JSContext* aCx, JS::Handle<JS::Value> aVal, uint8_t aTypeOffset); + EncodeJSVal(JSContext* aCx, + JS::Handle<JS::Value> aVal, + uint8_t aTypeOffset, + bool aCallGetters); void EncodeString(const nsAString& aString, uint8_t aTypeOffset); @@ -331,7 +337,8 @@ private: EncodeJSValInternal(JSContext* aCx, JS::Handle<JS::Value> aVal, uint8_t aTypeOffset, - uint16_t aRecursionDepth); + uint16_t aRecursionDepth, + bool aCallGetters); static nsresult DecodeJSValInternal(const unsigned char*& aPos, |