summaryrefslogtreecommitdiffstats
path: root/dom/crypto
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/crypto
parente08a4ad1c8096fc8de64fac4f36cf0c569cb4420 (diff)
parent519030e688dd7075a7cd9f14dd6fb9e210b5a689 (diff)
downloadUXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar
UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.gz
UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.lz
UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.tar.xz
UXP-98fe8b0ccbea37c2681ad8c788baa91554871f4d.zip
Merge branch 'redwood' into 28.9-platformRELBASE_20200426
Diffstat (limited to 'dom/crypto')
-rw-r--r--dom/crypto/WebCryptoThreadPool.cpp3
-rw-r--r--dom/crypto/WebCryptoThreadPool.h2
-rw-r--r--dom/crypto/moz.build2
3 files changed, 6 insertions, 1 deletions
diff --git a/dom/crypto/WebCryptoThreadPool.cpp b/dom/crypto/WebCryptoThreadPool.cpp
index 6a1e78608..a2b8e6239 100644
--- a/dom/crypto/WebCryptoThreadPool.cpp
+++ b/dom/crypto/WebCryptoThreadPool.cpp
@@ -9,6 +9,9 @@
#include "mozilla/Services.h"
#include "mozilla/StaticPtr.h"
#include "nsComponentManagerUtils.h"
+#include "nsContentUtils.h"
+#include "nsNSSComponent.h"
+#include "nsString.h"
#include "nsXPCOMCIDInternal.h"
#include "nsXPCOMPrivate.h"
#include "nsIObserverService.h"
diff --git a/dom/crypto/WebCryptoThreadPool.h b/dom/crypto/WebCryptoThreadPool.h
index 77c4afb24..76bf74708 100644
--- a/dom/crypto/WebCryptoThreadPool.h
+++ b/dom/crypto/WebCryptoThreadPool.h
@@ -7,6 +7,8 @@
#ifndef mozilla_dom_WebCryptoThreadPool_h
#define mozilla_dom_WebCryptoThreadPool_h
+#include "mozilla/Mutex.h"
+#include "nsIObserver.h"
#include "nsIObserverService.h"
#include "nsIThreadPool.h"
diff --git a/dom/crypto/moz.build b/dom/crypto/moz.build
index ba0b5f2cd..eb15a5530 100644
--- a/dom/crypto/moz.build
+++ b/dom/crypto/moz.build
@@ -13,7 +13,7 @@ EXPORTS.mozilla.dom += [
'WebCryptoThreadPool.h'
]
-UNIFIED_SOURCES += [
+SOURCES += [
'CryptoBuffer.cpp',
'CryptoKey.cpp',
'KeyAlgorithmProxy.cpp',