From 61b9b68278f5be0398c7398d586aba9c55c47c68 Mon Sep 17 00:00:00 2001 From: Brad Werth Date: Thu, 28 Sep 2017 14:25:44 -0700 Subject: [PATCH] Change MediaExpressionValue::from_css_value to only accept one type of unit (pixels). MozReview-Commit-ID: Hn3twVa8xLo --- components/style/gecko/media_queries.rs | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/components/style/gecko/media_queries.rs b/components/style/gecko/media_queries.rs index 00e2d0887ae9..ca967a866c0b 100644 --- a/components/style/gecko/media_queries.rs +++ b/components/style/gecko/media_queries.rs @@ -373,18 +373,8 @@ impl MediaExpressionValue { 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;