summaryrefslogtreecommitdiffstats
path: root/dom/push
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 12:56:46 +0200
committerwolfbeast <mcwerewolf@wolfbeast.com>2020-04-26 12:56:46 +0200
commit98fe8b0ccbea37c2681ad8c788baa91554871f4d (patch)
tree0e269a27661fea619ab07a533e0c1fa195c3c671 /dom/push
parente08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff)
parent519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff)
downloadUXP-RELBASE_20200426.tar
UXP-RELBASE_20200426.tar.gz
UXP-RELBASE_20200426.tar.lz
UXP-RELBASE_20200426.tar.xz
UXP-RELBASE_20200426.zip
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'dom/push')
-rw-r--r--dom/push/PushSubscriptionOptions.cpp1
-rw-r--r--dom/push/PushUtil.cpp1
-rw-r--r--dom/push/PushUtil.h1
-rw-r--r--dom/push/moz.build2
4 files changed, 4 insertions, 1 deletions
diff --git a/dom/push/PushSubscriptionOptions.cpp b/dom/push/PushSubscriptionOptions.cpp
index 39252e9e8..8f6ce5499 100644
--- a/dom/push/PushSubscriptionOptions.cpp
+++ b/dom/push/PushSubscriptionOptions.cpp
@@ -6,6 +6,7 @@
#include "mozilla/dom/PushSubscriptionOptionsBinding.h"
#include "mozilla/HoldDropJSObjects.h"
+#include "PushUtil.h"
namespace mozilla {
namespace dom {
diff --git a/dom/push/PushUtil.cpp b/dom/push/PushUtil.cpp
index 408b62048..1aba0e066 100644
--- a/dom/push/PushUtil.cpp
+++ b/dom/push/PushUtil.cpp
@@ -3,6 +3,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/dom/PushUtil.h"
+#include "mozilla/dom/UnionTypes.h" // for OwningArrayBufferViewOrArrayBuffer
namespace mozilla {
namespace dom {
diff --git a/dom/push/PushUtil.h b/dom/push/PushUtil.h
index 548ae2349..71a7af478 100644
--- a/dom/push/PushUtil.h
+++ b/dom/push/PushUtil.h
@@ -7,6 +7,7 @@
#include "nsTArray.h"
+#include "mozilla/ErrorResult.h"
#include "mozilla/dom/TypedArray.h"
namespace mozilla {
diff --git a/dom/push/moz.build b/dom/push/moz.build
index d138b270c..ca72c5f5d 100644
--- a/dom/push/moz.build
+++ b/dom/push/moz.build
@@ -37,7 +37,7 @@ EXPORTS.mozilla.dom += [
'PushUtil.h',
]
-UNIFIED_SOURCES += [
+SOURCES += [
'PushManager.cpp',
'PushNotifier.cpp',
'PushSubscription.cpp',