Bug 1404097: stylo: restore MediaExpressionValue::from_css_value to only accept one type of unit (pixels).
MozReview-Commit-ID: Hn3twVa8xLo
--- a/servo/components/style/gecko/media_queries.rs
+++ b/servo/components/style/gecko/media_queries.rs
@@ -368,28 +368,18 @@ impl MediaExpressionValue {
}
nsMediaFeature_ValueType::eBoolInteger => {
debug_assert!(css_value.mUnit == nsCSSUnit::eCSSUnit_Integer);
let i = css_value.integer_unchecked();
debug_assert!(i == 0 || i == 1);
Some(MediaExpressionValue::BoolInteger(i == 1))
}
nsMediaFeature_ValueType::eResolution => {
- // This is temporarily more complicated to allow Gecko Bug
- // 1376931 to land. Parts of that bug will supply pixel values
- // and expect them to be passed through without conversion.
- // After all parts of that bug have landed, Bug 1404097 will
- // return this function to once again only allow one type of
- // value to be accepted: this time, only pixel values.
- let res = match css_value.mUnit {
- nsCSSUnit::eCSSUnit_Pixel => Resolution::Dppx(css_value.float_unchecked()),
- nsCSSUnit::eCSSUnit_Inch => Resolution::Dpi(css_value.float_unchecked()),
- _ => unreachable!(),
- };
- Some(MediaExpressionValue::Resolution(res))
+ debug_assert!(css_value.mUnit == nsCSSUnit::eCSSUnit_Pixel);
+ Some(MediaExpressionValue::Resolution(Resolution::Dppx(css_value.float_unchecked())))
}
nsMediaFeature_ValueType::eEnumerated => {
let value = css_value.integer_unchecked() as i16;
Some(MediaExpressionValue::Enumerated(value))
}
nsMediaFeature_ValueType::eIdent => {
debug_assert!(css_value.mUnit == nsCSSUnit::eCSSUnit_Ident);
let string = unsafe {