diff --git a/components/style/gecko/media_features.rs b/components/style/gecko/media_features.rs index c96996a18ea..4fea1030dbc 100644 --- a/components/style/gecko/media_features.rs +++ b/components/style/gecko/media_features.rs @@ -559,19 +559,6 @@ fn eval_system_metric( query_value.map_or(supports_metric, |v| v == supports_metric) } -fn eval_moz_touch_enabled( - device: &Device, - query_value: Option, - _: Option, -) -> bool { - eval_system_metric( - device, - query_value, - atom!("-moz-touch-enabled"), - /* accessible_from_content = */ true, - ) -} - fn eval_moz_os_version( device: &Device, query_value: Option, @@ -613,7 +600,7 @@ macro_rules! system_metric_feature { /// to support new types in these entries and (2) ensuring that either /// nsPresContext::MediaFeatureValuesChanged is called when the value that /// would be returned by the evaluator function could change. -pub static MEDIA_FEATURES: [MediaFeatureDescription; 56] = [ +pub static MEDIA_FEATURES: [MediaFeatureDescription; 55] = [ feature!( atom!("width"), AllowsRanges::Yes, @@ -840,13 +827,4 @@ pub static MEDIA_FEATURES: [MediaFeatureDescription; 56] = [ system_metric_feature!(atom!("-moz-gtk-csd-close-button")), system_metric_feature!(atom!("-moz-gtk-csd-reversed-placement")), system_metric_feature!(atom!("-moz-system-dark-theme")), - // This is the only system-metric media feature that's accessible to - // content as of today. - // FIXME(emilio): Restrict (or remove?) when bug 1035774 lands. - feature!( - atom!("-moz-touch-enabled"), - AllowsRanges::No, - Evaluator::BoolInteger(eval_moz_touch_enabled), - ParsingRequirements::empty(), - ), ]; diff --git a/components/style/media_queries/media_feature_expression.rs b/components/style/media_queries/media_feature_expression.rs index f4eb40d1afa..08b13136ef9 100644 --- a/components/style/media_queries/media_feature_expression.rs +++ b/components/style/media_queries/media_feature_expression.rs @@ -221,9 +221,6 @@ fn consume_operation_or_colon(input: &mut Parser) -> Result, () fn disabled_by_pref(feature: &Atom, context: &ParserContext) -> bool { #[cfg(feature = "gecko")] { - if *feature == atom!("-moz-touch-enabled") { - return !static_prefs::pref!("layout.css.moz-touch-enabled.enabled"); - } if *feature == atom!("forced-colors") { return !static_prefs::pref!("layout.css.forced-colors.enabled"); }