mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-27 04:05:32 +00:00
Bug 1521879 - Part 3: Get --disable-webrtc builds working. r=mjf
Differential Revision: https://phabricator.services.mozilla.com/D17275 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
a0321d2a25
commit
94a554c150
@ -12,6 +12,7 @@ class MediaTransportHandlerIPC;
|
||||
|
||||
class MediaTransportChild : public dom::PMediaTransportChild {
|
||||
public:
|
||||
#ifdef MOZ_WEBRTC
|
||||
explicit MediaTransportChild(MediaTransportHandlerIPC* aUser);
|
||||
virtual ~MediaTransportChild();
|
||||
mozilla::ipc::IPCResult RecvOnCandidate(const string& transportId,
|
||||
@ -30,6 +31,7 @@ class MediaTransportChild : public dom::PMediaTransportChild {
|
||||
|
||||
private:
|
||||
RefPtr<MediaTransportHandlerIPC> mUser;
|
||||
#endif //MOZ_WEBRTC
|
||||
};
|
||||
|
||||
} // namespace mozilla
|
||||
|
@ -12,6 +12,7 @@ namespace mozilla {
|
||||
|
||||
class MediaTransportParent : public dom::PMediaTransportParent {
|
||||
public:
|
||||
#ifdef MOZ_WEBRTC
|
||||
MediaTransportParent();
|
||||
virtual ~MediaTransportParent();
|
||||
|
||||
@ -57,6 +58,7 @@ class MediaTransportParent : public dom::PMediaTransportParent {
|
||||
// Hide the sigslot/MediaTransportHandler stuff from IPC.
|
||||
class Impl;
|
||||
std::unique_ptr<Impl> mImpl;
|
||||
#endif //MOZ_WEBRTC
|
||||
};
|
||||
} // namespace mozilla
|
||||
#endif //_MTRANSPORTHANDLER_PARENT_H__
|
||||
|
@ -3,6 +3,8 @@
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
include protocol PSocketProcessBridge;
|
||||
|
||||
#ifdef MOZ_WEBRTC
|
||||
include PBrowserOrId;
|
||||
|
||||
// ParamTraits stuff for generated code and other classes we don't want to change
|
||||
@ -20,6 +22,7 @@ using mozilla::dom::RTCIceTransportPolicy from "mozilla/dom/RTCConfigurationBind
|
||||
// ParamTraits stuff for our own classes
|
||||
using MediaPacket from "mtransport/mediapacket.h";
|
||||
using net::NrIceStunAddrArray from "mozilla/net/PStunAddrsParams.h";
|
||||
#endif // MOZ_WEBRTC
|
||||
|
||||
namespace mozilla {
|
||||
namespace dom {
|
||||
@ -29,6 +32,8 @@ async protocol PMediaTransport {
|
||||
|
||||
parent:
|
||||
async __delete__();
|
||||
|
||||
#ifdef MOZ_WEBRTC
|
||||
async GetIceLog(nsCString pattern) returns (WebrtcGlobalLog loglines);
|
||||
async ClearIceLog();
|
||||
async EnterPrivateMode();
|
||||
@ -88,6 +93,8 @@ child:
|
||||
async OnEncryptedSending(string transportId, MediaPacket packet);
|
||||
async OnStateChange(string transportId, int state);
|
||||
async OnRtcpStateChange(string transportId, int state);
|
||||
|
||||
#endif // MOZ_WEBRTC
|
||||
};
|
||||
} // namespace dom
|
||||
} // namespace mozilla
|
||||
|
@ -15,6 +15,7 @@
|
||||
#include "mozilla/dom/WebCryptoTask.h"
|
||||
#include "mozilla/Move.h"
|
||||
#include "mozilla/Sprintf.h"
|
||||
#include "mtransport/dtlsidentity.h"
|
||||
|
||||
#include <cstdio>
|
||||
|
||||
|
@ -19,11 +19,11 @@
|
||||
#include "mozilla/RefPtr.h"
|
||||
#include "mozilla/dom/CryptoKey.h"
|
||||
#include "mozilla/dom/RTCCertificateBinding.h"
|
||||
#include "mtransport/dtlsidentity.h"
|
||||
#include "js/StructuredClone.h"
|
||||
#include "js/TypeDecls.h"
|
||||
|
||||
namespace mozilla {
|
||||
class DtlsIdentity;
|
||||
namespace dom {
|
||||
|
||||
class ObjectOrString;
|
||||
|
@ -53,9 +53,9 @@ if CONFIG['MOZ_WEBRTC']:
|
||||
'/media/webrtc/trunk/webrtc'
|
||||
]
|
||||
|
||||
IPDL_SOURCES += [
|
||||
'PMediaTransport.ipdl',
|
||||
]
|
||||
PREPROCESSED_IPDL_SOURCES += [
|
||||
'PMediaTransport.ipdl',
|
||||
]
|
||||
|
||||
XPIDL_SOURCES += [
|
||||
'nsITabSource.idl'
|
||||
|
Loading…
Reference in New Issue
Block a user