diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:43:14 +0000 |
commit | 8dd16259287f58f9273002717ec4d27e97127719 (patch) | |
tree | 3863e62a53829a84037444beab3abd4ed9dfc7d0 /dom/push/PushSubscriptionOptions.cpp | |
parent | Releasing progress-linux version 126.0.1-1~progress7.99u1. (diff) | |
download | firefox-8dd16259287f58f9273002717ec4d27e97127719.tar.xz firefox-8dd16259287f58f9273002717ec4d27e97127719.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'dom/push/PushSubscriptionOptions.cpp')
-rw-r--r-- | dom/push/PushSubscriptionOptions.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/dom/push/PushSubscriptionOptions.cpp b/dom/push/PushSubscriptionOptions.cpp index 1de3d96a2e..b14afa310d 100644 --- a/dom/push/PushSubscriptionOptions.cpp +++ b/dom/push/PushSubscriptionOptions.cpp @@ -8,9 +8,9 @@ #include "MainThreadUtils.h" #include "mozilla/dom/PushSubscriptionOptionsBinding.h" +#include "mozilla/dom/TypedArray.h" #include "mozilla/ErrorResult.h" #include "mozilla/HoldDropJSObjects.h" -#include "mozilla/dom/PushUtil.h" #include "nsIGlobalObject.h" #include "nsWrapperCache.h" @@ -51,13 +51,10 @@ JSObject* PushSubscriptionOptions::WrapObject( void PushSubscriptionOptions::GetApplicationServerKey( JSContext* aCx, JS::MutableHandle<JSObject*> aKey, ErrorResult& aRv) { if (!mRawAppServerKey.IsEmpty() && !mAppServerKey) { - JS::Rooted<JSObject*> appServerKey(aCx); - PushUtil::CopyArrayToArrayBuffer(aCx, mRawAppServerKey, &appServerKey, aRv); + mAppServerKey = ArrayBuffer::Create(aCx, mRawAppServerKey, aRv); if (aRv.Failed()) { return; } - MOZ_ASSERT(appServerKey); - mAppServerKey = appServerKey; } aKey.set(mAppServerKey); } |