diff options
| author | Emilio Cobos Álvarez <emilio@crisal.io> | 2022-10-20 14:24:36 +0000 |
|---|---|---|
| committer | Martin Robinson <mrobinson@igalia.com> | 2023-11-03 08:59:49 +0100 |
| commit | bfa293c5c5c48e8792881441093dde722aae6496 (patch) | |
| tree | e79781b761dbe17ac8f98a6cd1a694719c3bf855 /components/style/values/computed/mod.rs | |
| parent | d21aa99252f69171595595cffe95c569065dda59 (diff) | |
| download | servo-bfa293c5c5c48e8792881441093dde722aae6496.tar.gz servo-bfa293c5c5c48e8792881441093dde722aae6496.zip | |
style: Split in_media_query and in_container_query bits from computed::Context
No behavior change, but it makes more sense this way :)
Differential Revision: https://phabricator.services.mozilla.com/D159851
Diffstat (limited to 'components/style/values/computed/mod.rs')
| -rw-r--r-- | components/style/values/computed/mod.rs | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/components/style/values/computed/mod.rs b/components/style/values/computed/mod.rs index 0ef6568c669..1eeaeee316a 100644 --- a/components/style/values/computed/mod.rs +++ b/components/style/values/computed/mod.rs @@ -166,9 +166,12 @@ pub struct Context<'a> { #[cfg(feature = "servo")] pub cached_system_font: Option<()>, - /// Whether or not we are computing the media list in a media query + /// Whether or not we are computing the media list in a media query. pub in_media_query: bool, + /// Whether or not we are computing the container query condition. + pub in_container_query: bool, + /// The quirks mode of this context. pub quirks_mode: QuirksMode, @@ -215,6 +218,7 @@ impl<'a> Context<'a> { builder: StyleBuilder::for_inheritance(device, None, None), cached_system_font: None, in_media_query: true, + in_container_query: true, quirks_mode, for_smil_animation: false, container_info: None, @@ -248,7 +252,8 @@ impl<'a> Context<'a> { let context = Context { builder: StyleBuilder::for_inheritance(device, style, None), cached_system_font: None, - in_media_query: true, + in_media_query: false, + in_container_query: true, quirks_mode, for_smil_animation: false, container_info, @@ -271,6 +276,7 @@ impl<'a> Context<'a> { builder, cached_system_font: None, in_media_query: false, + in_container_query: false, quirks_mode, container_info: None, for_smil_animation: false, @@ -292,6 +298,7 @@ impl<'a> Context<'a> { builder, cached_system_font: None, in_media_query: false, + in_container_query: false, quirks_mode, container_info: None, for_smil_animation, @@ -344,7 +351,7 @@ impl<'a> Context<'a> { vertical, font, size, - self.in_media_query, + self.in_media_or_container_query(), retrieve_math_scales, ) } @@ -359,6 +366,11 @@ impl<'a> Context<'a> { .au_viewport_size_for_viewport_unit_resolution(variant) } + /// Whether we're in a media or container query. + pub fn in_media_or_container_query(&self) -> bool { + self.in_media_query || self.in_container_query + } + /// The default computed style we're getting our reset style from. pub fn default_style(&self) -> &ComputedValues { self.builder.default_style() |