зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1289857 - Fix MediaTrackConstraints.cpp to compile with --disable-webrtc again. r=mjf
MozReview-Commit-ID: GgVNQSbPCwf --HG-- extra : rebase_source : ac3a7c53c3ac8c5b98e05b6d72ddb2badd58617a
This commit is contained in:
Родитель
abbd438d8f
Коммит
44c9f33c25
|
@ -4,6 +4,7 @@
|
|||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
#include "MediaTrackConstraints.h"
|
||||
#include "mozilla/dom/MediaStreamTrackBinding.h"
|
||||
|
||||
#include <limits>
|
||||
#include <algorithm>
|
||||
|
@ -144,7 +145,7 @@ NormalizedConstraintSet::BooleanRange::BooleanRange(
|
|||
mIdeal.emplace(aOther.GetAsBoolean());
|
||||
}
|
||||
} else {
|
||||
const ConstrainBooleanParameters& r = aOther.GetAsConstrainBooleanParameters();
|
||||
const dom::ConstrainBooleanParameters& r = aOther.GetAsConstrainBooleanParameters();
|
||||
if (r.mIdeal.WasPassed()) {
|
||||
mIdeal.emplace(r.mIdeal.Value());
|
||||
}
|
||||
|
@ -188,7 +189,7 @@ NormalizedConstraintSet::StringRange::StringRange(
|
|||
|
||||
void
|
||||
NormalizedConstraintSet::StringRange::SetFrom(
|
||||
const ConstrainDOMStringParameters& aOther)
|
||||
const dom::ConstrainDOMStringParameters& aOther)
|
||||
{
|
||||
if (aOther.mIdeal.WasPassed()) {
|
||||
mIdeal.clear();
|
||||
|
@ -295,7 +296,7 @@ NormalizedConstraints::NormalizedConstraints(
|
|||
{
|
||||
// Create a list of member pointers.
|
||||
nsTArray<MemberPtrType> list;
|
||||
NormalizedConstraints dummy(MediaTrackConstraints(), &list);
|
||||
NormalizedConstraints dummy(dom::MediaTrackConstraints(), &list);
|
||||
|
||||
// Do intersection of all required constraints, and average of ideals,
|
||||
|
||||
|
|
|
@ -33,7 +33,6 @@ if CONFIG['MOZ_WEBRTC']:
|
|||
'MediaEngineRemoteVideoSource.cpp',
|
||||
'MediaEngineTabVideoSource.cpp',
|
||||
'MediaEngineWebRTCAudio.cpp',
|
||||
'MediaTrackConstraints.cpp',
|
||||
'RTCCertificate.cpp',
|
||||
'RTCIdentityProviderRegistrar.cpp',
|
||||
]
|
||||
|
@ -66,6 +65,7 @@ XPIDL_SOURCES += [
|
|||
|
||||
UNIFIED_SOURCES += [
|
||||
'MediaEngineDefault.cpp',
|
||||
'MediaTrackConstraints.cpp',
|
||||
'PeerIdentity.cpp',
|
||||
]
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче