зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1213517 - optimize for maintenance of constraints (member pointer approach). r=padenot
MozReview-Commit-ID: 4JYb6QnMtVk --HG-- extra : rebase_source : 6ecab6312fd647e85f3dfea5b0c5ec53b6c04b24
This commit is contained in:
Jan-Ivar Bruaroey
Родитель
357d904c2e
Коммит
5aac06d091
|
|
@ -76,8 +76,14 @@ NormalizedConstraintSet::Range<bool>::FinalizeMerge()
|
|||
}
|
||||
|
||||
NormalizedConstraintSet::LongRange::LongRange(
|
||||
const dom::OwningLongOrConstrainLongRange& aOther, bool advanced)
|
||||
: Range<int32_t>(1 + INT32_MIN, INT32_MAX) // +1 avoids Windows compiler bug
|
||||
LongPtrType aMemberPtr,
|
||||
const char* aName,
|
||||
const dom::OwningLongOrConstrainLongRange& aOther,
|
||||
bool advanced,
|
||||
nsTArray<MemberPtrType>* aList)
|
||||
: Range<int32_t>((MemberPtrType)aMemberPtr, aName,
|
||||
1 + INT32_MIN, INT32_MAX, // +1 avoids Windows compiler bug
|
||||
aList)
|
||||
{
|
||||
if (aOther.IsLong()) {
|
||||
if (advanced) {
|
||||
|
|
@ -90,10 +96,26 @@ NormalizedConstraintSet::LongRange::LongRange(
|
|||
}
|
||||
}
|
||||
|
||||
NormalizedConstraintSet::LongLongRange::LongLongRange(
|
||||
LongLongPtrType aMemberPtr,
|
||||
const char* aName,
|
||||
const long long& aOther,
|
||||
nsTArray<MemberPtrType>* aList)
|
||||
: Range<int64_t>((MemberPtrType)aMemberPtr, aName,
|
||||
1 + INT64_MIN, INT64_MAX, // +1 avoids Windows compiler bug
|
||||
aList)
|
||||
{
|
||||
mIdeal.emplace(aOther);
|
||||
}
|
||||
|
||||
NormalizedConstraintSet::DoubleRange::DoubleRange(
|
||||
const dom::OwningDoubleOrConstrainDoubleRange& aOther, bool advanced)
|
||||
: Range<double>(-std::numeric_limits<double>::infinity(),
|
||||
std::numeric_limits<double>::infinity())
|
||||
DoublePtrType aMemberPtr,
|
||||
const char* aName,
|
||||
const dom::OwningDoubleOrConstrainDoubleRange& aOther, bool advanced,
|
||||
nsTArray<MemberPtrType>* aList)
|
||||
: Range<double>((MemberPtrType)aMemberPtr, aName,
|
||||
-std::numeric_limits<double>::infinity(),
|
||||
std::numeric_limits<double>::infinity(), aList)
|
||||
{
|
||||
if (aOther.IsDouble()) {
|
||||
if (advanced) {
|
||||
|
|
@ -107,8 +129,12 @@ NormalizedConstraintSet::DoubleRange::DoubleRange(
|
|||
}
|
||||
|
||||
NormalizedConstraintSet::BooleanRange::BooleanRange(
|
||||
const dom::OwningBooleanOrConstrainBooleanParameters& aOther, bool advanced)
|
||||
: Range<bool>(false, true)
|
||||
BooleanPtrType aMemberPtr,
|
||||
const char* aName,
|
||||
const dom::OwningBooleanOrConstrainBooleanParameters& aOther,
|
||||
bool advanced,
|
||||
nsTArray<MemberPtrType>* aList)
|
||||
: Range<bool>((MemberPtrType)aMemberPtr, aName, false, true, aList)
|
||||
{
|
||||
if (aOther.IsBoolean()) {
|
||||
if (advanced) {
|
||||
|
|
@ -129,8 +155,12 @@ NormalizedConstraintSet::BooleanRange::BooleanRange(
|
|||
}
|
||||
|
||||
NormalizedConstraintSet::StringRange::StringRange(
|
||||
StringPtrType aMemberPtr,
|
||||
const char* aName,
|
||||
const dom::OwningStringOrStringSequenceOrConstrainDOMStringParameters& aOther,
|
||||
bool advanced)
|
||||
bool advanced,
|
||||
nsTArray<MemberPtrType>* aList)
|
||||
: BaseRange((MemberPtrType)aMemberPtr, aName, aList)
|
||||
{
|
||||
if (aOther.IsString()) {
|
||||
if (advanced) {
|
||||
|
|
@ -240,8 +270,11 @@ NormalizedConstraintSet::StringRange::Merge(const StringRange& aOther)
|
|||
return true;
|
||||
}
|
||||
|
||||
NormalizedConstraints::NormalizedConstraints(const dom::MediaTrackConstraints& aOther)
|
||||
: NormalizedConstraintSet(aOther, false), mBadConstraint(nullptr)
|
||||
NormalizedConstraints::NormalizedConstraints(
|
||||
const dom::MediaTrackConstraints& aOther,
|
||||
nsTArray<MemberPtrType>* aList)
|
||||
: NormalizedConstraintSet(aOther, false, aList)
|
||||
, mBadConstraint(nullptr)
|
||||
{
|
||||
if (aOther.mAdvanced.WasPassed()) {
|
||||
for (auto& entry : aOther.mAdvanced.Value()) {
|
||||
|
|
@ -257,79 +290,32 @@ NormalizedConstraints::NormalizedConstraints(
|
|||
: NormalizedConstraintSet(*aOthers[0])
|
||||
, mBadConstraint(nullptr)
|
||||
{
|
||||
// Create a list of member pointers.
|
||||
nsTArray<MemberPtrType> list;
|
||||
NormalizedConstraints dummy(MediaTrackConstraints(), &list);
|
||||
|
||||
// Do intersection of all required constraints, and average of ideals.
|
||||
|
||||
for (uint32_t i = 1; i < aOthers.Length(); i++) {
|
||||
auto& set = *aOthers[i];
|
||||
auto& other = *aOthers[i];
|
||||
|
||||
if (!mWidth.Merge(set.mWidth)) {
|
||||
mBadConstraint = "width";
|
||||
return;
|
||||
}
|
||||
if (!mHeight.Merge(set.mHeight)) {
|
||||
mBadConstraint = "height";
|
||||
return;
|
||||
}
|
||||
if (!mFrameRate.Merge(set.mFrameRate)) {
|
||||
mBadConstraint = "frameRate";
|
||||
return;
|
||||
}
|
||||
if (!mFacingMode.Merge(set.mFacingMode)) {
|
||||
mBadConstraint = "facingMode";
|
||||
return;
|
||||
}
|
||||
if (mMediaSource != set.mMediaSource) {
|
||||
mBadConstraint = "mediaSource";
|
||||
return;
|
||||
}
|
||||
if (mBrowserWindow != set.mBrowserWindow) {
|
||||
mBadConstraint = "browserWindow";
|
||||
return;
|
||||
}
|
||||
if (!mViewportOffsetX.Merge(set.mViewportOffsetX)) {
|
||||
mBadConstraint = "viewportOffsetX";
|
||||
return;
|
||||
}
|
||||
if (!mViewportOffsetY.Merge(set.mViewportOffsetY)) {
|
||||
mBadConstraint = "viewportOffsetY";
|
||||
return;
|
||||
}
|
||||
if (!mViewportWidth.Merge(set.mViewportWidth)) {
|
||||
mBadConstraint = "viewportWidth";
|
||||
return;
|
||||
}
|
||||
if (!mViewportHeight.Merge(set.mViewportHeight)) {
|
||||
mBadConstraint = "viewportHeight";
|
||||
return;
|
||||
}
|
||||
if (!mEchoCancellation.Merge(set.mEchoCancellation)) {
|
||||
mBadConstraint = "echoCancellation";
|
||||
return;
|
||||
}
|
||||
if (!mMozNoiseSuppression.Merge(set.mMozNoiseSuppression)) {
|
||||
mBadConstraint = "mozNoiseSuppression";
|
||||
return;
|
||||
}
|
||||
if (!mMozAutoGainControl.Merge(set.mMozAutoGainControl)) {
|
||||
mBadConstraint = "mozAutoGainControl";
|
||||
return;
|
||||
for (auto& memberPtr : list) {
|
||||
auto& member = this->*memberPtr;
|
||||
auto& otherMember = other.*memberPtr;
|
||||
|
||||
if (!member.Merge(otherMember)) {
|
||||
mBadConstraint = member.mName;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
for (auto& entry : set.mAdvanced) {
|
||||
for (auto& entry : other.mAdvanced) {
|
||||
mAdvanced.AppendElement(entry);
|
||||
}
|
||||
}
|
||||
mWidth.FinalizeMerge();
|
||||
mHeight.FinalizeMerge();
|
||||
mFrameRate.FinalizeMerge();
|
||||
mFacingMode.FinalizeMerge();
|
||||
mViewportOffsetX.FinalizeMerge();
|
||||
mViewportOffsetY.FinalizeMerge();
|
||||
mViewportWidth.FinalizeMerge();
|
||||
mViewportHeight.FinalizeMerge();
|
||||
mEchoCancellation.FinalizeMerge();
|
||||
mMozNoiseSuppression.FinalizeMerge();
|
||||
mMozAutoGainControl.FinalizeMerge();
|
||||
for (auto& memberPtr : list) {
|
||||
(this->*memberPtr).FinalizeMerge();
|
||||
}
|
||||
}
|
||||
|
||||
FlattenedConstraints::FlattenedConstraints(const NormalizedConstraints& aOther)
|
||||
|
|
|
|||
|
|
@ -36,17 +36,43 @@ static Enum StringToEnum(const EnumValuesStrings& aStrings,
|
|||
// Helper classes for orthogonal constraints without interdependencies.
|
||||
// Instead of constraining values, constrain the constraints themselves.
|
||||
|
||||
struct NormalizedConstraintSet
|
||||
class NormalizedConstraintSet
|
||||
{
|
||||
protected:
|
||||
class BaseRange
|
||||
{
|
||||
protected:
|
||||
typedef BaseRange NormalizedConstraintSet::* MemberPtrType;
|
||||
|
||||
BaseRange(MemberPtrType aMemberPtr, const char* aName,
|
||||
nsTArray<MemberPtrType>* aList) : mName(aName) {
|
||||
if (aList) {
|
||||
aList->AppendElement(aMemberPtr);
|
||||
}
|
||||
}
|
||||
virtual ~BaseRange() {}
|
||||
public:
|
||||
virtual bool Merge(const BaseRange& aOther) = 0;
|
||||
virtual void FinalizeMerge() = 0;
|
||||
|
||||
const char* mName;
|
||||
};
|
||||
|
||||
typedef BaseRange NormalizedConstraintSet::* MemberPtrType;
|
||||
|
||||
public:
|
||||
template<class ValueType>
|
||||
class Range
|
||||
class Range : public BaseRange
|
||||
{
|
||||
public:
|
||||
ValueType mMin, mMax;
|
||||
Maybe<ValueType> mIdeal;
|
||||
|
||||
Range(ValueType aMin, ValueType aMax)
|
||||
: mMin(aMin), mMax(aMax), mMergeDenominator(0) {}
|
||||
Range(MemberPtrType aMemberPtr, const char* aName, ValueType aMin,
|
||||
ValueType aMax, nsTArray<MemberPtrType>* aList)
|
||||
: BaseRange(aMemberPtr, aName, aList)
|
||||
, mMin(aMin), mMax(aMax), mMergeDenominator(0) {}
|
||||
virtual ~Range() {};
|
||||
|
||||
template<class ConstrainRange>
|
||||
void SetFrom(const ConstrainRange& aOther);
|
||||
|
|
@ -79,7 +105,7 @@ struct NormalizedConstraintSet
|
|||
}
|
||||
return true;
|
||||
}
|
||||
void FinalizeMerge()
|
||||
void FinalizeMerge() override
|
||||
{
|
||||
if (mMergeDenominator) {
|
||||
*mIdeal /= mMergeDenominator;
|
||||
|
|
@ -87,34 +113,77 @@ struct NormalizedConstraintSet
|
|||
}
|
||||
}
|
||||
private:
|
||||
bool Merge(const BaseRange& aOther) override {
|
||||
return Merge(static_cast<const Range&>(aOther));
|
||||
}
|
||||
|
||||
uint32_t mMergeDenominator;
|
||||
};
|
||||
|
||||
struct LongRange : public Range<int32_t>
|
||||
{
|
||||
LongRange(const dom::OwningLongOrConstrainLongRange& aOther, bool advanced);
|
||||
typedef LongRange NormalizedConstraintSet::* LongPtrType;
|
||||
|
||||
LongRange(LongPtrType aMemberPtr, const char* aName,
|
||||
const dom::OwningLongOrConstrainLongRange& aOther, bool advanced,
|
||||
nsTArray<MemberPtrType>* aList);
|
||||
};
|
||||
|
||||
struct LongLongRange : public Range<int64_t>
|
||||
{
|
||||
typedef LongLongRange NormalizedConstraintSet::* LongLongPtrType;
|
||||
|
||||
LongLongRange(LongLongPtrType aMemberPtr, const char* aName,
|
||||
const long long& aOther,
|
||||
nsTArray<MemberPtrType>* aList);
|
||||
};
|
||||
|
||||
struct DoubleRange : public Range<double>
|
||||
{
|
||||
DoubleRange(const dom::OwningDoubleOrConstrainDoubleRange& aOther,
|
||||
bool advanced);
|
||||
typedef DoubleRange NormalizedConstraintSet::* DoublePtrType;
|
||||
|
||||
DoubleRange(DoublePtrType aMemberPtr,
|
||||
const char* aName,
|
||||
const dom::OwningDoubleOrConstrainDoubleRange& aOther,
|
||||
bool advanced,
|
||||
nsTArray<MemberPtrType>* aList);
|
||||
};
|
||||
|
||||
struct BooleanRange : public Range<bool>
|
||||
{
|
||||
BooleanRange(const dom::OwningBooleanOrConstrainBooleanParameters& aOther,
|
||||
bool advanced);
|
||||
typedef BooleanRange NormalizedConstraintSet::* BooleanPtrType;
|
||||
|
||||
BooleanRange(BooleanPtrType aMemberPtr, const char* aName,
|
||||
const dom::OwningBooleanOrConstrainBooleanParameters& aOther,
|
||||
bool advanced,
|
||||
nsTArray<MemberPtrType>* aList);
|
||||
|
||||
BooleanRange(BooleanPtrType aMemberPtr, const char* aName, const bool& aOther,
|
||||
nsTArray<MemberPtrType>* aList)
|
||||
: Range<bool>((MemberPtrType)aMemberPtr, aName, false, true, aList) {
|
||||
mIdeal.emplace(aOther);
|
||||
}
|
||||
};
|
||||
|
||||
struct StringRange
|
||||
struct StringRange : public BaseRange
|
||||
{
|
||||
typedef std::set<nsString> ValueType;
|
||||
ValueType mExact, mIdeal;
|
||||
|
||||
StringRange(
|
||||
typedef StringRange NormalizedConstraintSet::* StringPtrType;
|
||||
|
||||
StringRange(StringPtrType aMemberPtr, const char* aName,
|
||||
const dom::OwningStringOrStringSequenceOrConstrainDOMStringParameters& aOther,
|
||||
bool advanced);
|
||||
bool advanced,
|
||||
nsTArray<MemberPtrType>* aList);
|
||||
|
||||
StringRange(StringPtrType aMemberPtr, const char* aName,
|
||||
const nsString& aOther, nsTArray<MemberPtrType>* aList)
|
||||
: BaseRange((MemberPtrType)aMemberPtr, aName, aList) {
|
||||
mIdeal.insert(aOther);
|
||||
}
|
||||
|
||||
~StringRange() {}
|
||||
|
||||
void SetFrom(const dom::ConstrainDOMStringParameters& aOther);
|
||||
ValueType Clamp(const ValueType& n) const;
|
||||
|
|
@ -124,39 +193,56 @@ struct NormalizedConstraintSet
|
|||
bool Intersects(const StringRange& aOther) const;
|
||||
void Intersect(const StringRange& aOther);
|
||||
bool Merge(const StringRange& aOther);
|
||||
void FinalizeMerge() {}
|
||||
void FinalizeMerge() override {}
|
||||
private:
|
||||
bool Merge(const BaseRange& aOther) override {
|
||||
return Merge(static_cast<const StringRange&>(aOther));
|
||||
}
|
||||
};
|
||||
|
||||
// All new constraints should be added here whether they use flattening or not
|
||||
LongRange mWidth, mHeight;
|
||||
DoubleRange mFrameRate;
|
||||
StringRange mFacingMode;
|
||||
nsString mMediaSource;
|
||||
long long mBrowserWindow;
|
||||
bool mScrollWithPage;
|
||||
StringRange mMediaSource;
|
||||
LongLongRange mBrowserWindow;
|
||||
BooleanRange mScrollWithPage;
|
||||
StringRange mDeviceId;
|
||||
LongRange mViewportOffsetX, mViewportOffsetY, mViewportWidth, mViewportHeight;
|
||||
BooleanRange mEchoCancellation, mMozNoiseSuppression, mMozAutoGainControl;
|
||||
|
||||
private:
|
||||
typedef NormalizedConstraintSet T;
|
||||
public:
|
||||
NormalizedConstraintSet(const dom::MediaTrackConstraintSet& aOther,
|
||||
bool advanced)
|
||||
: mWidth(aOther.mWidth, advanced)
|
||||
, mHeight(aOther.mHeight, advanced)
|
||||
, mFrameRate(aOther.mFrameRate, advanced)
|
||||
, mFacingMode(aOther.mFacingMode, advanced)
|
||||
, mMediaSource(aOther.mMediaSource)
|
||||
, mBrowserWindow(aOther.mBrowserWindow.WasPassed() ?
|
||||
aOther.mBrowserWindow.Value() : 0)
|
||||
, mScrollWithPage(aOther.mScrollWithPage.WasPassed() ?
|
||||
aOther.mScrollWithPage.Value() : false)
|
||||
, mDeviceId(aOther.mDeviceId, advanced)
|
||||
, mViewportOffsetX(aOther.mViewportOffsetX, advanced)
|
||||
, mViewportOffsetY(aOther.mViewportOffsetY, advanced)
|
||||
, mViewportWidth(aOther.mViewportWidth, advanced)
|
||||
, mViewportHeight(aOther.mViewportHeight, advanced)
|
||||
, mEchoCancellation(aOther.mEchoCancellation, advanced)
|
||||
, mMozNoiseSuppression(aOther.mMozNoiseSuppression, advanced)
|
||||
, mMozAutoGainControl(aOther.mMozAutoGainControl, advanced) {}
|
||||
bool advanced,
|
||||
nsTArray<MemberPtrType>* aList = nullptr)
|
||||
: mWidth(&T::mWidth, "width", aOther.mWidth, advanced, aList)
|
||||
, mHeight(&T::mHeight, "height", aOther.mHeight, advanced, aList)
|
||||
, mFrameRate(&T::mFrameRate, "frameRate", aOther.mFrameRate, advanced, aList)
|
||||
, mFacingMode(&T::mFacingMode, "facingMode", aOther.mFacingMode, advanced, aList)
|
||||
, mMediaSource(&T::mMediaSource, "mediaSource", aOther.mMediaSource, aList)
|
||||
, mBrowserWindow(&T::mBrowserWindow, "browserWindow",
|
||||
aOther.mBrowserWindow.WasPassed() ?
|
||||
aOther.mBrowserWindow.Value() : 0, aList)
|
||||
, mScrollWithPage(&T::mScrollWithPage, "scrollWithPage",
|
||||
aOther.mScrollWithPage.WasPassed() ?
|
||||
aOther.mScrollWithPage.Value() : false, aList)
|
||||
, mDeviceId(&T::mDeviceId, "deviceId", aOther.mDeviceId, advanced, aList)
|
||||
, mViewportOffsetX(&T::mViewportOffsetX, "viewportOffsetX",
|
||||
aOther.mViewportOffsetX, advanced, aList)
|
||||
, mViewportOffsetY(&T::mViewportOffsetY, "viewportOffsetY",
|
||||
aOther.mViewportOffsetY, advanced, aList)
|
||||
, mViewportWidth(&T::mViewportWidth, "viewportWidth",
|
||||
aOther.mViewportWidth, advanced, aList)
|
||||
, mViewportHeight(&T::mViewportHeight, "viewportHeight",
|
||||
aOther.mViewportHeight, advanced, aList)
|
||||
, mEchoCancellation(&T::mEchoCancellation, "echoCancellation",
|
||||
aOther.mEchoCancellation, advanced, aList)
|
||||
, mMozNoiseSuppression(&T::mMozNoiseSuppression, "mozNoiseSuppression",
|
||||
aOther.mMozNoiseSuppression,
|
||||
advanced, aList)
|
||||
, mMozAutoGainControl(&T::mMozAutoGainControl, "mozAutoGainControl",
|
||||
aOther.mMozAutoGainControl, advanced, aList) {}
|
||||
};
|
||||
|
||||
template<> bool NormalizedConstraintSet::Range<bool>::Merge(const Range& aOther);
|
||||
|
|
@ -165,7 +251,10 @@ template<> void NormalizedConstraintSet::Range<bool>::FinalizeMerge();
|
|||
// Used instead of MediaTrackConstraints in lower-level code.
|
||||
struct NormalizedConstraints : public NormalizedConstraintSet
|
||||
{
|
||||
explicit NormalizedConstraints(const dom::MediaTrackConstraints& aOther);
|
||||
explicit NormalizedConstraints(const dom::MediaTrackConstraints& aOther,
|
||||
nsTArray<MemberPtrType>* aList = nullptr);
|
||||
|
||||
// Merge constructor
|
||||
explicit NormalizedConstraints(
|
||||
const nsTArray<const NormalizedConstraints*>& aOthers);
|
||||
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче