Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-04 14:03:39 +01:00
Code Issues Projects Releases Packages Wiki Activity

Change MediaExpressionValue::from_css_value to only accept one type of unit (pixels).

Browse source 
MozReview-Commit-ID: Hn3twVa8xLo
This commit is contained in:
Brad Werth 2017-09-28 14:25:44 -07:00 • committed by Brad Werth
parent f2879a568d
commit 61b9b68278
1 changed files with 2 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
components/style/gecko/media_queries.rs
View file

@ -373,18 +373,8 @@ impl MediaExpressionValue {
Some(MediaExpressionValue::BoolInteger(i == 1)) Some(MediaExpressionValue::BoolInteger(i == 1))
} }
nsMediaFeature_ValueType::eResolution => { nsMediaFeature_ValueType::eResolution => {
// This is temporarily more complicated to allow Gecko Bug debug_assert!(css_value.mUnit == nsCSSUnit::eCSSUnit_Pixel);
// 1376931 to land. Parts of that bug will supply pixel values Some(MediaExpressionValue::Resolution(Resolution::Dppx(css_value.float_unchecked())))
// 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))
} }
nsMediaFeature_ValueType::eEnumerated => { nsMediaFeature_ValueType::eEnumerated => {
let value = css_value.integer_unchecked() as i16; let value = css_value.integer_unchecked() as i16;