diff options
Diffstat (limited to 'components/script/dom/mediadevices.rs')
| -rw-r--r-- | components/script/dom/mediadevices.rs | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/components/script/dom/mediadevices.rs b/components/script/dom/mediadevices.rs index 2ae2ebaca10..f2f5a45d09c 100644 --- a/components/script/dom/mediadevices.rs +++ b/components/script/dom/mediadevices.rs @@ -118,22 +118,20 @@ fn convert_constraints(js: &BooleanOrMediaTrackConstraints) -> Option<MediaTrack match js { BooleanOrMediaTrackConstraints::Boolean(false) => None, BooleanOrMediaTrackConstraints::Boolean(true) => Some(Default::default()), - BooleanOrMediaTrackConstraints::MediaTrackConstraints(ref c) => { - Some(MediaTrackConstraintSet { - height: c.parent.height.as_ref().and_then(convert_culong), - width: c.parent.width.as_ref().and_then(convert_culong), - aspect: c.parent.aspectRatio.as_ref().and_then(convert_cdouble), - frame_rate: c.parent.frameRate.as_ref().and_then(convert_cdouble), - sample_rate: c.parent.sampleRate.as_ref().and_then(convert_culong), - }) - }, + BooleanOrMediaTrackConstraints::MediaTrackConstraints(c) => Some(MediaTrackConstraintSet { + height: c.parent.height.as_ref().and_then(convert_culong), + width: c.parent.width.as_ref().and_then(convert_culong), + aspect: c.parent.aspectRatio.as_ref().and_then(convert_cdouble), + frame_rate: c.parent.frameRate.as_ref().and_then(convert_cdouble), + sample_rate: c.parent.sampleRate.as_ref().and_then(convert_culong), + }), } } fn convert_culong(js: &ConstrainULong) -> Option<Constrain<u32>> { match js { ConstrainULong::ClampedUnsignedLong(val) => Some(Constrain::Value(*val)), - ConstrainULong::ConstrainULongRange(ref range) => { + ConstrainULong::ConstrainULongRange(range) => { if range.parent.min.is_some() || range.parent.max.is_some() { Some(Constrain::Range(ConstrainRange { min: range.parent.min, @@ -150,7 +148,7 @@ fn convert_culong(js: &ConstrainULong) -> Option<Constrain<u32>> { fn convert_cdouble(js: &ConstrainDouble) -> Option<Constrain<f64>> { match js { ConstrainDouble::Double(val) => Some(Constrain::Value(**val)), - ConstrainDouble::ConstrainDoubleRange(ref range) => { + ConstrainDouble::ConstrainDoubleRange(range) => { if range.parent.min.is_some() || range.parent.max.is_some() { Some(Constrain::Range(ConstrainRange { min: range.parent.min.map(|x| *x), |