From bc82d005aed65631c1bc066ce776999a4c8bc2ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Fri, 14 Apr 2023 19:05:28 +0000 Subject: [PATCH] style: Remove cascade layers pref These have been enabled by default for quite a while. Differential Revision: https://phabricator.services.mozilla.com/D175513 --- components/style/properties/properties.mako.rs | 10 +--------- components/style/stylesheets/rule_parser.rs | 9 +-------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index 7e4d2264aed..17e74cf0cc2 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -1188,14 +1188,6 @@ impl CSSWideKeyword { } } -#[inline] -fn cascade_layes_enabled() -> bool { - #[cfg(feature = "gecko")] - return static_prefs::pref!("layout.css.cascade-layers.enabled"); - #[cfg(feature = "servo")] - return false; -} - impl CSSWideKeyword { /// Parses a CSS wide keyword from a CSS identifier. pub fn from_ident(ident: &str) -> Result { @@ -1204,7 +1196,7 @@ impl CSSWideKeyword { "inherit" => CSSWideKeyword::Inherit, "unset" => CSSWideKeyword::Unset, "revert" => CSSWideKeyword::Revert, - "revert-layer" if cascade_layes_enabled() => CSSWideKeyword::RevertLayer, + "revert-layer" => CSSWideKeyword::RevertLayer, _ => return Err(()), }) } diff --git a/components/style/stylesheets/rule_parser.rs b/components/style/stylesheets/rule_parser.rs index 804d0d688e2..a60cd0ea6d0 100644 --- a/components/style/stylesheets/rule_parser.rs +++ b/components/style/stylesheets/rule_parser.rs @@ -264,14 +264,7 @@ impl<'a, 'i> AtRuleParser<'i> for TopLevelRuleParser<'a> { }).ok() }; - #[cfg(feature = "gecko")] - let layers_enabled = static_prefs::pref!("layout.css.cascade-layers.enabled"); - #[cfg(feature = "servo")] - let layers_enabled = false; - - let layer = if !layers_enabled { - None - } else if input.try_parse(|input| input.expect_ident_matching("layer")).is_ok() { + let layer = if input.try_parse(|input| input.expect_ident_matching("layer")).is_ok() { Some(ImportLayer { name: None, })