|
 |
0f3627d |
diff -up firefox-53.0/dom/media/webrtc/MediaEngine.h.1335250 firefox-53.0/dom/media/webrtc/MediaEngine.h
|
|
|
0f3627d |
--- firefox-53.0/dom/media/webrtc/MediaEngine.h.1335250 2017-04-11 06:15:22.000000000 +0200
|
|
|
0f3627d |
+++ firefox-53.0/dom/media/webrtc/MediaEngine.h 2017-04-19 20:35:55.264741939 +0200
|
|
|
0f3627d |
@@ -226,7 +226,7 @@ public:
|
|
|
c1909fe |
~AllocationHandle() {}
|
|
|
c1909fe |
public:
|
|
|
c1909fe |
AllocationHandle(const dom::MediaTrackConstraints& aConstraints,
|
|
|
c1909fe |
- const ipc::PrincipalInfo& aPrincipalInfo,
|
|
|
c1909fe |
+ const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
|
|
|
c1909fe |
const MediaEnginePrefs& aPrefs,
|
|
|
c1909fe |
const nsString& aDeviceId)
|
|
|
c1909fe |
|
|
|
0f3627d |
@@ -236,7 +236,7 @@ public:
|
|
|
c1909fe |
mDeviceId(aDeviceId) {}
|
|
|
c1909fe |
public:
|
|
|
c1909fe |
NormalizedConstraints mConstraints;
|
|
|
c1909fe |
- ipc::PrincipalInfo mPrincipalInfo;
|
|
|
c1909fe |
+ mozilla::ipc::PrincipalInfo mPrincipalInfo;
|
|
|
c1909fe |
MediaEnginePrefs mPrefs;
|
|
|
c1909fe |
nsString mDeviceId;
|
|
|
c1909fe |
};
|
|
|
0f3627d |
@@ -327,7 +327,7 @@ public:
|
|
|
0f3627d |
virtual nsresult Allocate(const dom::MediaTrackConstraints &aConstraints,
|
|
|
0f3627d |
const MediaEnginePrefs &aPrefs,
|
|
|
0f3627d |
const nsString& aDeviceId,
|
|
|
0f3627d |
- const ipc::PrincipalInfo& aPrincipalInfo,
|
|
|
0f3627d |
+ const mozilla::ipc::PrincipalInfo& aPrincipalInfo,
|
|
|
0f3627d |
AllocationHandle** aOutHandle,
|
|
|
0f3627d |
const char** aOutBadConstraint)
|
|
|
c1909fe |
{
|