Backed out changeset 669ac95baa5d (bug 1264508) for causing build bustages on PushSubscriptionOptions.cpp CLOSED TREE

Author: pstanciu

dom/push/PushManager.cpp

@@ -14,6 +14,7 @@
 #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,6 +17,7 @@
 #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"
@@ -230,30 +231,36 @@ already_AddRefed<PushSubscription> PushSubscription::Constructor(
 
   nsTArray<uint8_t> rawKey;
   if (aInitDict.mP256dhKey.WasPassed() &&
-      !aInitDict.mP256dhKey.Value().AppendDataTo(rawKey)) {
+      !aInitDict.mP256dhKey.Value().IsNull() &&
+      !aInitDict.mP256dhKey.Value().Value().AppendDataTo(rawKey)) {
     aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
 
   nsTArray<uint8_t> authSecret;
   if (aInitDict.mAuthSecret.WasPassed() &&
-      !aInitDict.mAuthSecret.Value().AppendDataTo(authSecret)) {
+      !aInitDict.mAuthSecret.Value().IsNull() &&
+      !aInitDict.mAuthSecret.Value().Value().AppendDataTo(authSecret)) {
     aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
     return nullptr;
   }
 
   nsTArray<uint8_t> appServerKey;
   if (aInitDict.mAppServerKey.WasPassed() &&
-      !AppendTypedArrayDataTo(aInitDict.mAppServerKey.Value(), appServerKey)) {
-    aRv.Throw(NS_ERROR_OUT_OF_MEMORY);
-    return nullptr;
+      !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;
+    }
   }
 
   Nullable<EpochTimeStamp> expirationTime;
-  if (aInitDict.mExpirationTime.WasPassed()) {
-    expirationTime.SetValue(aInitDict.mExpirationTime.Value());
-  } else {
+  if (aInitDict.mExpirationTime.IsNull()) {
     expirationTime.SetNull();
+  } else {
+    expirationTime.SetValue(aInitDict.mExpirationTime.Value());
   }
 
   RefPtr<PushSubscription> sub = new PushSubscription(
@@ -300,10 +307,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 && !mRawP256dhKey.IsEmpty()) {
-    aKey.set(ArrayBuffer::Create(aCx, mRawP256dhKey, aRv));
-  } else if (aType == PushEncryptionKeyName::Auth && !mAuthSecret.IsEmpty()) {
-    aKey.set(ArrayBuffer::Create(aCx, mAuthSecret, aRv));
+  if (aType == PushEncryptionKeyName::P256dh) {
+    PushUtil::CopyArrayToArrayBuffer(aCx, mRawP256dhKey, aKey, aRv);
+  } else if (aType == PushEncryptionKeyName::Auth) {
+    PushUtil::CopyArrayToArrayBuffer(aCx, mAuthSecret, aKey, aRv);
   } else {
     aKey.set(nullptr);
   }

dom/push/PushSubscriptionOptions.cpp

@@ -10,6 +10,7 @@
 #include "mozilla/dom/PushSubscriptionOptionsBinding.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/HoldDropJSObjects.h"
+#include "mozilla/dom/PushUtil.h"
 #include "nsIGlobalObject.h"
 #include "nsWrapperCache.h"
 
@@ -50,10 +51,13 @@ JSObject* PushSubscriptionOptions::WrapObject(
 void PushSubscriptionOptions::GetApplicationServerKey(
     JSContext* aCx, JS::MutableHandle<JSObject*> aKey, ErrorResult& aRv) {
   if (!mRawAppServerKey.IsEmpty() && !mAppServerKey) {
-    mAppServerKey = ArrayBuffer::Create(aCx, mRawAppServerKey, aRv);
+    JS::Rooted<JSObject*> appServerKey(aCx);
+    PushUtil::CopyArrayToArrayBuffer(aCx, mRawAppServerKey, &appServerKey, aRv);
     if (aRv.Failed()) {
       return;
     }
+    MOZ_ASSERT(appServerKey);
+    mAppServerKey = appServerKey;
   }
   aKey.set(mAppServerKey);
 }

dom/push/PushUtil.cpp

@@ -0,0 +1,36 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#include "mozilla/dom/PushUtil.h"
+#include "mozilla/dom/UnionTypes.h"
+
+namespace mozilla::dom {
+
+/* static */
+bool PushUtil::CopyBufferSourceToArray(
+    const OwningArrayBufferViewOrArrayBuffer& aSource,
+    nsTArray<uint8_t>& aArray) {
+  MOZ_ASSERT(aArray.IsEmpty());
+  return AppendTypedArrayDataTo(aSource, aArray);
+}
+
+/* static */
+void PushUtil::CopyArrayToArrayBuffer(JSContext* aCx,
+                                      const nsTArray<uint8_t>& aArray,
+                                      JS::MutableHandle<JSObject*> aValue,
+                                      ErrorResult& aRv) {
+  if (aArray.IsEmpty()) {
+    aValue.set(nullptr);
+    return;
+  }
+  JS::Rooted<JSObject*> buffer(aCx, ArrayBuffer::Create(aCx, aArray, aRv));
+  if (NS_WARN_IF(aRv.Failed())) {
+    return;
+  }
+  aValue.set(buffer);
+}
+
+}  // namespace mozilla::dom

dom/push/PushUtil.h

@@ -0,0 +1,39 @@
+/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=8 sts=2 et sw=2 tw=80: */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+#ifndef mozilla_dom_PushUtil_h
+#define mozilla_dom_PushUtil_h
+
+#include "nsTArray.h"
+
+#include "mozilla/dom/TypedArray.h"
+
+namespace mozilla {
+class ErrorResult;
+
+namespace dom {
+
+class OwningArrayBufferViewOrArrayBuffer;
+
+class PushUtil final {
+ private:
+  PushUtil() = delete;
+
+ public:
+  static bool CopyBufferSourceToArray(
+      const OwningArrayBufferViewOrArrayBuffer& aSource,
+      nsTArray<uint8_t>& aArray);
+
+  static void CopyArrayToArrayBuffer(JSContext* aCx,
+                                     const nsTArray<uint8_t>& aArray,
+                                     JS::MutableHandle<JSObject*> aValue,
+                                     ErrorResult& aRv);
+};
+
+}  // namespace dom
+}  // namespace mozilla
+
+#endif  // mozilla_dom_PushUtil_h

dom/push/moz.build

@@ -44,13 +44,15 @@ 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/serviceworkers/ServiceWorkerEvents.cpp

@@ -26,6 +26,7 @@
 #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/webidl/PushSubscription.webidl

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