diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/style/gecko/pseudo_element.rs | 6 | ||||
| -rw-r--r-- | components/style/properties/properties.mako.rs | 3 | ||||
| -rw-r--r-- | components/style/style_adjuster.rs | 26 |
3 files changed, 35 insertions, 0 deletions
diff --git a/components/style/gecko/pseudo_element.rs b/components/style/gecko/pseudo_element.rs index 564a288b448..97ce0f4e5a1 100644 --- a/components/style/gecko/pseudo_element.rs +++ b/components/style/gecko/pseudo_element.rs @@ -83,6 +83,12 @@ impl PseudoElement { *self == PseudoElement::FirstLetter } + /// Whether this pseudo-element is ::-moz-fieldset-content. + #[inline] + pub fn is_fieldset_content(&self) -> bool { + *self == PseudoElement::FieldsetContent + } + /// Whether this pseudo-element is lazily-cascaded. #[inline] pub fn is_lazy(&self) -> bool { diff --git a/components/style/properties/properties.mako.rs b/components/style/properties/properties.mako.rs index 43248e0feae..b04f03547a1 100644 --- a/components/style/properties/properties.mako.rs +++ b/components/style/properties/properties.mako.rs @@ -2668,6 +2668,9 @@ bitflags! { /// is used by Gecko to prevent display:contents on generated /// content. const PROHIBIT_DISPLAY_CONTENTS = 0x10, + + /// Whether we're styling the ::-moz-fieldset-content anonymous box. + const IS_FIELDSET_CONTENT = 0x20, } } diff --git a/components/style/style_adjuster.rs b/components/style/style_adjuster.rs index 9b4d8a69551..72c4e675c8b 100644 --- a/components/style/style_adjuster.rs +++ b/components/style/style_adjuster.rs @@ -291,6 +291,31 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> { self.style.mutate_box().set_display(display::inline); } + /// If a <fieldset> has grid/flex display type, we need to inherit + /// this type into its ::-moz-fieldset-content anonymous box. + #[cfg(feature = "gecko")] + fn adjust_for_fieldset_content(&mut self, + layout_parent_style: &ComputedValuesInner, + flags: CascadeFlags) { + use properties::IS_FIELDSET_CONTENT; + if !flags.contains(IS_FIELDSET_CONTENT) { + return; + } + debug_assert_eq!(self.style.get_box().clone_display(), display::block); + // TODO We actually want style from parent rather than layout + // parent, so that this fixup doesn't happen incorrectly when + // when <fieldset> has "display: contents". + let parent_display = layout_parent_style.get_box().clone_display(); + let new_display = match parent_display { + display::flex | display::inline_flex => Some(display::flex), + display::grid | display::inline_grid => Some(display::grid), + _ => None, + }; + if let Some(new_display) = new_display { + self.style.mutate_box().set_display(new_display); + } + } + /// -moz-center, -moz-left and -moz-right are used for HTML's alignment. /// /// This is covering the <div align="right"><table>...</table></div> case. @@ -412,6 +437,7 @@ impl<'a, 'b: 'a> StyleAdjuster<'a, 'b> { #[cfg(feature = "gecko")] { self.adjust_for_prohibited_display_contents(flags); + self.adjust_for_fieldset_content(layout_parent_style, flags); } self.adjust_for_top_layer(); self.blockify_if_necessary(layout_parent_style, flags); |