Skip to content

Commit 649fe4a

Browse files
committed
Bug 1626555 - Add dom/webauthn to the list of non-unified-build-compatible directories. r=sg
Depends on D96586 Differential Revision: https://phabricator.services.mozilla.com/D96590
1 parent eeec967 commit 649fe4a

12 files changed

+29
-6
lines changed

build/non-unified-compat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,3 +62,4 @@ dom/tests/
6262
dom/u2f/
6363
dom/url/
6464
dom/vr/
65+
dom/webauthn/

dom/webauthn/AuthenticatorResponse.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
#include "mozilla/dom/CryptoBuffer.h"
1515
#include "nsCycleCollectionParticipant.h"
1616
#include "nsWrapperCache.h"
17+
#include "nsCOMPtr.h"
18+
#include "nsPIDOMWindow.h"
1719

1820
namespace mozilla {
1921
namespace dom {

dom/webauthn/PublicKeyCredential.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
#include "mozilla/dom/PublicKeyCredential.h"
99
#include "mozilla/dom/WebAuthenticationBinding.h"
1010
#include "nsCycleCollectionParticipant.h"
11+
#include "mozilla/dom/AuthenticatorResponse.h"
1112

1213
#ifdef OS_WIN
1314
# include "WinWebAuthnManager.h"

dom/webauthn/PublicKeyCredential.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "mozilla/ErrorResult.h"
1515
#include "nsCycleCollectionParticipant.h"
1616
#include "nsWrapperCache.h"
17+
#include "mozilla/dom/CryptoBuffer.h"
1718

1819
namespace mozilla {
1920
namespace dom {

dom/webauthn/U2FTokenManager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
#include "mozilla/ClearOnShutdown.h"
1616
#include "mozilla/Unused.h"
1717
#include "nsTextFormatter.h"
18+
#include "mozilla/Telemetry.h"
1819

1920
#ifdef MOZ_WIDGET_ANDROID
2021
# include "mozilla/dom/AndroidWebAuthnTokenManager.h"

dom/webauthn/WebAuthnManager.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,17 @@
99
#include "nsIURIMutator.h"
1010
#include "nsThreadUtils.h"
1111
#include "WebAuthnCoseIdentifiers.h"
12+
#include "mozilla/dom/AuthenticatorAssertionResponse.h"
1213
#include "mozilla/dom/AuthenticatorAttestationResponse.h"
14+
#include "mozilla/dom/PublicKeyCredential.h"
1315
#include "mozilla/dom/Promise.h"
1416
#include "mozilla/dom/PWebAuthnTransaction.h"
1517
#include "mozilla/dom/WebAuthnManager.h"
1618
#include "mozilla/dom/WebAuthnTransactionChild.h"
1719
#include "mozilla/dom/WebAuthnUtil.h"
1820
#include "mozilla/ipc/BackgroundChild.h"
1921
#include "mozilla/ipc/PBackgroundChild.h"
22+
#include "authenticator/src/u2fhid-capi.h"
2023

2124
#ifdef OS_WIN
2225
# include "WinWebAuthnManager.h"

dom/webauthn/WebAuthnManager.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
namespace mozilla {
4646
namespace dom {
4747

48+
class Credential;
49+
4850
class WebAuthnTransaction {
4951
public:
5052
explicit WebAuthnTransaction(const RefPtr<Promise>& aPromise)

dom/webauthn/WebAuthnManagerBase.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
#include "mozilla/dom/WebAuthnManagerBase.h"
88
#include "mozilla/dom/WebAuthnTransactionChild.h"
9+
#include "mozilla/ipc/BackgroundChild.h"
10+
#include "mozilla/ipc/PBackgroundChild.h"
911
#include "mozilla/dom/Event.h"
1012
#include "nsGlobalWindowInner.h"
1113
#include "nsPIWindowRoot.h"
@@ -45,7 +47,8 @@ bool WebAuthnManagerBase::MaybeCreateBackgroundActor() {
4547
return true;
4648
}
4749

48-
PBackgroundChild* actorChild = BackgroundChild::GetOrCreateForCurrentThread();
50+
::mozilla::ipc::PBackgroundChild* actorChild =
51+
::mozilla::ipc::BackgroundChild::GetOrCreateForCurrentThread();
4952
if (NS_WARN_IF(!actorChild)) {
5053
return false;
5154
}

dom/webauthn/WebAuthnManagerBase.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,16 @@
88
#define mozilla_dom_WebAuthnManagerBase_h
99

1010
#include "nsIDOMEventListener.h"
11+
#include "nsCycleCollectionParticipant.h"
12+
#include "nsCOMPtr.h"
1113

1214
/*
1315
* A base class used by WebAuthn and U2F implementations, providing shared
1416
* functionality and requiring an interface used by the IPC child actors.
1517
*/
1618

19+
class nsPIDOMWindowInner;
20+
1721
namespace mozilla {
1822
namespace dom {
1923

dom/webauthn/WebAuthnTransactionParent.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ namespace dom {
1919
mozilla::ipc::IPCResult WebAuthnTransactionParent::RecvRequestRegister(
2020
const uint64_t& aTransactionId,
2121
const WebAuthnMakeCredentialInfo& aTransactionInfo) {
22-
AssertIsOnBackgroundThread();
22+
::mozilla::ipc::AssertIsOnBackgroundThread();
2323

2424
#ifdef OS_WIN
2525
if (WinWebAuthnManager::AreWebAuthNApisAvailable()) {
@@ -40,7 +40,7 @@ mozilla::ipc::IPCResult WebAuthnTransactionParent::RecvRequestRegister(
4040
mozilla::ipc::IPCResult WebAuthnTransactionParent::RecvRequestSign(
4141
const uint64_t& aTransactionId,
4242
const WebAuthnGetAssertionInfo& aTransactionInfo) {
43-
AssertIsOnBackgroundThread();
43+
::mozilla::ipc::AssertIsOnBackgroundThread();
4444

4545
#ifdef OS_WIN
4646
if (WinWebAuthnManager::AreWebAuthNApisAvailable()) {
@@ -60,7 +60,7 @@ mozilla::ipc::IPCResult WebAuthnTransactionParent::RecvRequestSign(
6060

6161
mozilla::ipc::IPCResult WebAuthnTransactionParent::RecvRequestCancel(
6262
const uint64_t& aTransactionId) {
63-
AssertIsOnBackgroundThread();
63+
::mozilla::ipc::AssertIsOnBackgroundThread();
6464

6565
#ifdef OS_WIN
6666
if (WinWebAuthnManager::AreWebAuthNApisAvailable()) {
@@ -79,7 +79,7 @@ mozilla::ipc::IPCResult WebAuthnTransactionParent::RecvRequestCancel(
7979
}
8080

8181
mozilla::ipc::IPCResult WebAuthnTransactionParent::RecvDestroyMe() {
82-
AssertIsOnBackgroundThread();
82+
::mozilla::ipc::AssertIsOnBackgroundThread();
8383

8484
// The child was disconnected from the WebAuthnManager instance and will send
8585
// no further messages. It is kept alive until we delete it explicitly.
@@ -97,7 +97,7 @@ mozilla::ipc::IPCResult WebAuthnTransactionParent::RecvDestroyMe() {
9797
}
9898

9999
void WebAuthnTransactionParent::ActorDestroy(ActorDestroyReason aWhy) {
100-
AssertIsOnBackgroundThread();
100+
::mozilla::ipc::AssertIsOnBackgroundThread();
101101

102102
// Called either by Send__delete__() in RecvDestroyMe() above, or when
103103
// the channel disconnects. Ensure the token manager forgets about us.

0 commit comments

Comments
 (0)