Bug 1264508 - Use generic helpers for converting ArrayBuffer or BufferSource to/from nsTArray in Push API code. r=webidl,saschanaz

Differential Revision: https://phabricator.services.mozilla.com/D207176

Author: petervanderbeken

dom/push/PushManager.cpp

@@ -14,7 +14,6 @@
 #include "mozilla/dom/PushManagerBinding.h"
 #include "mozilla/dom/PushSubscription.h"
 #include "mozilla/dom/PushSubscriptionOptionsBinding.h"
-#include "mozilla/dom/PushUtil.h"
 #include "mozilla/dom/RootedDictionary.h"
 #include "mozilla/dom/ServiceWorker.h"
 #include "mozilla/dom/WorkerRunnable.h"

dom/push/PushSubscription.cpp

@@ -17,7 +17,6 @@
 #include "mozilla/dom/Promise.h"
 #include "mozilla/dom/PromiseWorkerProxy.h"
 #include "mozilla/dom/PushSubscriptionOptions.h"
-#include "mozilla/dom/PushUtil.h"
 #include "mozilla/dom/WorkerCommon.h"
 #include "mozilla/dom/WorkerPrivate.h"
 #include "mozilla/dom/WorkerRunnable.h"
@@ -231,36 +230,30 @@ already_AddRefed<PushSubscription> PushSubscription::Constructor(
 
   nsTArray<uint8_t> rawKey;
   if (aInitDict.mP256dhKey.WasPassed() &&
-      !aInitDict.mP256dhKey.Value().IsNull() &&
-      !aInitDict.mP256dhKey.Value().Value().AppendDataTo(rawKey)) {
+      !aInitDict.mP256dhKey.Value().AppendDataTo(rawKey)) {
     aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
 
   nsTArray<uint8_t> authSecret;
   if (aInitDict.mAuthSecret.WasPassed() &&
-      !aInitDict.mAuthSecret.Value().IsNull() &&
-      !aInitDict.mAuthSecret.Value().Value().AppendDataTo(authSecret)) {
+      !aInitDict.mAuthSecret.Value().AppendDataTo(authSecret)) {
     aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
 
   nsTArray<uint8_t> appServerKey;
   if (aInitDict.mAppServerKey.WasPassed() &&
-      !aInitDict.mAppServerKey.Value().IsNull()) {
-    const OwningArrayBufferViewOrArrayBuffer& bufferSource =
-        aInitDict.mAppServerKey.Value().Value();
-    if (!PushUtil::CopyBufferSourceToArray(bufferSource, appServerKey)) {
-      aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
-      return nullptr;
-    }
+      !AppendTypedArrayDataTo(aInitDict.mAppServerKey.Value(), appServerKey)) {
+    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
+    return nullptr;
   }
 
   Nullable<EpochTimeStamp> expirationTime;
-  if (aInitDict.mExpirationTime.IsNull()) {
-    expirationTime.SetNull();
-  } else {
+  if (aInitDict.mExpirationTime.WasPassed()) {
     expirationTime.SetValue(aInitDict.mExpirationTime.Value());
+  } else {
+    expirationTime.SetNull();
   }
 
   RefPtr<PushSubscription> sub = new PushSubscription(
@@ -307,10 +300,10 @@ already_AddRefed<Promise> PushSubscription::Unsubscribe(ErrorResult& aRv) {
 void PushSubscription::GetKey(JSContext* aCx, PushEncryptionKeyName aType,
                               JS::MutableHandle<JSObject*> aKey,
                               ErrorResult& aRv) {
-  if (aType == PushEncryptionKeyName::P256dh) {
-    PushUtil::CopyArrayToArrayBuffer(aCx, mRawP256dhKey, aKey, aRv);
-  } else if (aType == PushEncryptionKeyName::Auth) {
-    PushUtil::CopyArrayToArrayBuffer(aCx, mAuthSecret, aKey, aRv);
+  if (aType == PushEncryptionKeyName::P256dh && !mRawP256dhKey.IsEmpty()) {
+    aKey.set(ArrayBuffer::Create(aCx, mRawP256dhKey, aRv));
+  } else if (aType == PushEncryptionKeyName::Auth && !mAuthSecret.IsEmpty()) {
+    aKey.set(ArrayBuffer::Create(aCx, mAuthSecret, aRv));
   } else {
     aKey.set(nullptr);
   }

dom/push/PushSubscriptionOptions.cpp

@@ -10,7 +10,6 @@
 #include "mozilla/dom/PushSubscriptionOptionsBinding.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/HoldDropJSObjects.h"
-#include "mozilla/dom/PushUtil.h"
 #include "nsIGlobalObject.h"
 #include "nsWrapperCache.h"
 
@@ -51,13 +50,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);
 }

dom/push/PushUtil.cpp

@@ -44,15 +44,13 @@ EXPORTS.mozilla.dom += [
     "PushNotifier.h",
     "PushSubscription.h",
     "PushSubscriptionOptions.h",
-    "PushUtil.h",
 ]
 
 UNIFIED_SOURCES += [
     "PushManager.cpp",
     "PushNotifier.cpp",
     "PushSubscription.cpp",
     "PushSubscriptionOptions.cpp",
-    "PushUtil.cpp",
 ]
 
 TEST_DIRS += ["test/xpcshell"]

dom/push/PushUtil.h

@@ -26,7 +26,6 @@
 #include "mozilla/dom/PromiseNativeHandler.h"
 #include "mozilla/dom/PushEventBinding.h"
 #include "mozilla/dom/PushMessageDataBinding.h"
-#include "mozilla/dom/PushUtil.h"
 #include "mozilla/dom/Request.h"
 #include "mozilla/dom/Response.h"
 #include "mozilla/dom/ServiceWorkerOp.h"

dom/push/moz.build

@@ -35,10 +35,10 @@ dictionary PushSubscriptionInit
 {
   required USVString endpoint;
   required USVString scope;
-  ArrayBuffer? p256dhKey;
-  ArrayBuffer? authSecret;
-  BufferSource? appServerKey;
-  EpochTimeStamp? expirationTime = null;
+  ArrayBuffer p256dhKey;
+  ArrayBuffer authSecret;
+  BufferSource appServerKey;
+  EpochTimeStamp expirationTime;
 };
 
 [Exposed=(Window,Worker), Func="ServiceWorkerVisible"]