diff options
| -rw-r--r-- | components/script/layout_dom/element.rs | 4 | ||||
| -rw-r--r-- | components/style/properties/longhands/box.mako.rs | 6 | ||||
| -rw-r--r-- | components/style/servo/media_queries.rs | 6 | ||||
| -rw-r--r-- | components/style/stylesheets/rule_parser.rs | 5 | ||||
| -rw-r--r-- | components/style/values/computed/mod.rs | 2 |
5 files changed, 15 insertions, 8 deletions
diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs index 22325ab4f92..91be4baa6ed 100644 --- a/components/script/layout_dom/element.rs +++ b/components/script/layout_dom/element.rs @@ -452,6 +452,10 @@ impl<'dom, LayoutDataType: LayoutDataTrait> style::dom::TElement fn namespace(&self) -> &Namespace { self.element.namespace() } + + fn primary_box_size(&self) -> euclid::default::Size2D<app_units::Au> { + todo!(); + } } impl<'dom, LayoutDataType: LayoutDataTrait> ::selectors::Element diff --git a/components/style/properties/longhands/box.mako.rs b/components/style/properties/longhands/box.mako.rs index dd8957fd8ff..7765b7e71e1 100644 --- a/components/style/properties/longhands/box.mako.rs +++ b/components/style/properties/longhands/box.mako.rs @@ -440,9 +440,10 @@ ${helpers.predefined_type( "container-type", "ContainerType", "computed::ContainerType::NONE", - engines="gecko", + engines="gecko servo", animation_value_type="none", gecko_pref="layout.css.container-queries.enabled", + servo_pref="layout.container-queries.enabled", spec="https://drafts.csswg.org/css-contain-3/#container-type", )} @@ -450,9 +451,10 @@ ${helpers.predefined_type( "container-name", "ContainerName", "computed::ContainerName::none()", - engines="gecko", + engines="gecko servo", animation_value_type="none", gecko_pref="layout.css.container-queries.enabled", + servo_pref="layout.container-queries.enabled", spec="https://drafts.csswg.org/css-contain-3/#container-name", )} diff --git a/components/style/servo/media_queries.rs b/components/style/servo/media_queries.rs index f1e57211b7e..d4a4d581b1f 100644 --- a/components/style/servo/media_queries.rs +++ b/components/style/servo/media_queries.rs @@ -7,7 +7,7 @@ use crate::context::QuirksMode; use crate::custom_properties::CssEnvironment; use crate::font_metrics::FontMetrics; -use crate::queries::feature::{AllowsRanges, Evaluator, ParsingRequirements, QueryFeatureDescription}; +use crate::queries::feature::{AllowsRanges, Evaluator, FeatureFlags, QueryFeatureDescription}; use crate::media_queries::MediaType; use crate::properties::ComputedValues; use crate::values::computed::CSSPixelLength; @@ -259,13 +259,13 @@ lazy_static! { atom!("width"), AllowsRanges::Yes, Evaluator::Length(eval_width), - ParsingRequirements::empty(), + FeatureFlags::empty(), ), feature!( atom!("scan"), AllowsRanges::No, keyword_evaluator!(eval_scan, Scan), - ParsingRequirements::empty(), + FeatureFlags::empty(), ), ]; } diff --git a/components/style/stylesheets/rule_parser.rs b/components/style/stylesheets/rule_parser.rs index b0203338e56..646a7dbbfd2 100644 --- a/components/style/stylesheets/rule_parser.rs +++ b/components/style/stylesheets/rule_parser.rs @@ -458,7 +458,10 @@ fn container_queries_enabled() -> bool { #[cfg(feature = "gecko")] return static_prefs::pref!("layout.css.container-queries.enabled"); #[cfg(feature = "servo")] - return false; + return servo_config::prefs::pref_map() + .get("layout.container-queries.enabled") + .as_bool() + .unwrap_or(false); } impl<'a, 'b, 'i> AtRuleParser<'i> for NestedRuleParser<'a, 'b> { diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs index 78dfd1ba1cb..d8011094711 100644 --- a/components/style/values/computed/mod.rs +++ b/components/style/values/computed/mod.rs @@ -221,7 +221,6 @@ impl<'a> Context<'a> { F: FnOnce(&Context) -> R, { let mut conditions = RuleCacheConditions::default(); - let provider = get_metrics_provider_for_product(); let (container_info, style) = match container_info_and_style { Some((ci, s)) => (Some(ci), Some(s)), @@ -232,7 +231,6 @@ impl<'a> Context<'a> { let quirks_mode = device.quirks_mode(); let context = Context { builder: StyleBuilder::for_inheritance(device, style, None), - font_metrics_provider: &provider, cached_system_font: None, in_media_query: true, quirks_mode, |