From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- dom/push/PushSubscriptionOptions.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'dom/push/PushSubscriptionOptions.cpp') 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 aKey, ErrorResult& aRv) { if (!mRawAppServerKey.IsEmpty() && !mAppServerKey) { - JS::Rooted 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); } -- cgit v1.2.3