Merge remote-tracking branch 'origin/tracking' into custom

This commit is contained in:
roytam1 2022-07-15 08:55:29 +08:00
commit cc3a2ef623
5 changed files with 44 additions and 3 deletions

View file

@ -6,6 +6,7 @@
#include "MediaTrackConstraints.h"
#include "mozilla/dom/MediaStreamTrackBinding.h"
#include "mozilla/Unused.h"
#include "mozilla/Types.h"
#include <limits>
#include <algorithm>
@ -39,7 +40,7 @@ NormalizedConstraintSet::Range<ValueType>::SetFrom(const ConstrainRange& aOther)
// The Range code works surprisingly well for bool, except when averaging ideals.
template<>
bool
bool MOZ_EXPORT
NormalizedConstraintSet::Range<bool>::Merge(const Range& aOther) {
if (!Intersects(aOther)) {
return false;