Bug 1743707 - fix --disable-webrtc builds due to missing RTCConfigurationBinding.h r=ipc-reviewers,nika

Differential Revision: https://phabricator.services.mozilla.com/D133126
This commit is contained in:
Michael Froman 2021-12-08 22:49:12 +00:00
Родитель e574cb98de
Коммит a4058f34b7
6 изменённых файлов: 17 добавлений и 18 удалений

Просмотреть файл

@ -2084,23 +2084,17 @@ bool ContentChild::DeallocPSpeechSynthesisChild(PSpeechSynthesisChild* aActor) {
} }
#endif #endif
PWebrtcGlobalChild* ContentChild::AllocPWebrtcGlobalChild() {
#ifdef MOZ_WEBRTC #ifdef MOZ_WEBRTC
PWebrtcGlobalChild* ContentChild::AllocPWebrtcGlobalChild() {
auto* child = new WebrtcGlobalChild(); auto* child = new WebrtcGlobalChild();
return child; return child;
#else
return nullptr;
#endif
} }
bool ContentChild::DeallocPWebrtcGlobalChild(PWebrtcGlobalChild* aActor) { bool ContentChild::DeallocPWebrtcGlobalChild(PWebrtcGlobalChild* aActor) {
#ifdef MOZ_WEBRTC
delete static_cast<WebrtcGlobalChild*>(aActor); delete static_cast<WebrtcGlobalChild*>(aActor);
return true; return true;
#else
return false;
#endif
} }
#endif
mozilla::ipc::IPCResult ContentChild::RecvRegisterChrome( mozilla::ipc::IPCResult ContentChild::RecvRegisterChrome(
nsTArray<ChromePackage>&& packages, nsTArray<ChromePackage>&& packages,

Просмотреть файл

@ -499,9 +499,10 @@ class ContentChild final : public PContentChild,
void GetAvailableDictionaries(nsTArray<nsCString>& aDictionaries); void GetAvailableDictionaries(nsTArray<nsCString>& aDictionaries);
#ifdef MOZ_WEBRTC
PWebrtcGlobalChild* AllocPWebrtcGlobalChild(); PWebrtcGlobalChild* AllocPWebrtcGlobalChild();
bool DeallocPWebrtcGlobalChild(PWebrtcGlobalChild* aActor); bool DeallocPWebrtcGlobalChild(PWebrtcGlobalChild* aActor);
#endif
PContentPermissionRequestChild* AllocPContentPermissionRequestChild( PContentPermissionRequestChild* AllocPContentPermissionRequestChild(
const nsTArray<PermissionRequest>& aRequests, const nsTArray<PermissionRequest>& aRequests,

Просмотреть файл

@ -4996,22 +4996,16 @@ void ContentParent::NotifyUpdatedFonts(bool aFullRebuild) {
} }
} }
PWebrtcGlobalParent* ContentParent::AllocPWebrtcGlobalParent() {
#ifdef MOZ_WEBRTC #ifdef MOZ_WEBRTC
PWebrtcGlobalParent* ContentParent::AllocPWebrtcGlobalParent() {
return WebrtcGlobalParent::Alloc(); return WebrtcGlobalParent::Alloc();
#else
return nullptr;
#endif
} }
bool ContentParent::DeallocPWebrtcGlobalParent(PWebrtcGlobalParent* aActor) { bool ContentParent::DeallocPWebrtcGlobalParent(PWebrtcGlobalParent* aActor) {
#ifdef MOZ_WEBRTC
WebrtcGlobalParent::Dealloc(static_cast<WebrtcGlobalParent*>(aActor)); WebrtcGlobalParent::Dealloc(static_cast<WebrtcGlobalParent*>(aActor));
return true; return true;
#else
return false;
#endif
} }
#endif
mozilla::ipc::IPCResult ContentParent::RecvSetOfflinePermission( mozilla::ipc::IPCResult ContentParent::RecvSetOfflinePermission(
const Principal& aPrincipal) { const Principal& aPrincipal) {

Просмотреть файл

@ -1165,8 +1165,10 @@ class ContentParent final
bool DeallocPFileDescriptorSetParent(PFileDescriptorSetParent*); bool DeallocPFileDescriptorSetParent(PFileDescriptorSetParent*);
#ifdef MOZ_WEBRTC
PWebrtcGlobalParent* AllocPWebrtcGlobalParent(); PWebrtcGlobalParent* AllocPWebrtcGlobalParent();
bool DeallocPWebrtcGlobalParent(PWebrtcGlobalParent* aActor); bool DeallocPWebrtcGlobalParent(PWebrtcGlobalParent* aActor);
#endif
mozilla::ipc::IPCResult RecvUpdateDropEffect(const uint32_t& aDragAction, mozilla::ipc::IPCResult RecvUpdateDropEffect(const uint32_t& aDragAction,
const uint32_t& aDropEffect); const uint32_t& aDropEffect);

Просмотреть файл

@ -35,7 +35,9 @@ include protocol PSpeechSynthesis;
include protocol PTestShell; include protocol PTestShell;
include protocol PRemoteSpellcheckEngine; include protocol PRemoteSpellcheckEngine;
include protocol PWebBrowserPersistDocument; include protocol PWebBrowserPersistDocument;
#ifdef MOZ_WEBRTC
include protocol PWebrtcGlobal; include protocol PWebrtcGlobal;
#endif
include protocol PWindowGlobal; include protocol PWindowGlobal;
include protocol PURLClassifier; include protocol PURLClassifier;
include protocol PURLClassifierLocal; include protocol PURLClassifierLocal;
@ -451,7 +453,9 @@ sync protocol PContent
manages PTestShell; manages PTestShell;
manages PRemoteSpellcheckEngine; manages PRemoteSpellcheckEngine;
manages PWebBrowserPersistDocument; manages PWebBrowserPersistDocument;
#ifdef MOZ_WEBRTC
manages PWebrtcGlobal; manages PWebrtcGlobal;
#endif
manages PURLClassifier; manages PURLClassifier;
manages PURLClassifierLocal; manages PURLClassifierLocal;
manages PScriptCache; manages PScriptCache;
@ -1054,7 +1058,9 @@ parent:
async PMedia(); async PMedia();
#ifdef MOZ_WEBRTC
async PWebrtcGlobal(); async PWebrtcGlobal();
#endif
async CreateAudioIPCConnection() returns (FileDescOrError fd); async CreateAudioIPCConnection() returns (FileDescOrError fd);

Просмотреть файл

@ -55,6 +55,9 @@ if CONFIG["MOZ_WEBRTC"]:
SOURCES += [ SOURCES += [
"MediaEngineWebRTC.cpp", "MediaEngineWebRTC.cpp",
] ]
PREPROCESSED_IPDL_SOURCES += [
"PWebrtcGlobal.ipdl",
]
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
"..", "..",
"/dom/base", "/dom/base",
@ -84,7 +87,6 @@ if CONFIG["MOZ_WEBRTC_SIGNALING"]:
PREPROCESSED_IPDL_SOURCES += [ PREPROCESSED_IPDL_SOURCES += [
"PMediaTransport.ipdl", "PMediaTransport.ipdl",
"PWebrtcGlobal.ipdl",
] ]
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [