diff options
| author | bors-servo <infra@servo.org> | 2023-05-04 11:35:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-04 11:35:25 +0200 |
| commit | 4e37d07ea4f2bba124f78f17873fbb02c66d1cdb (patch) | |
| tree | 7dc272f33fa36faf34423d42dfa2e4654be09843 /components/layout_2020/dom_traversal.rs | |
| parent | f29834608aee21c1845737067c16f92adfb77f08 (diff) | |
| parent | 72302e2dae6c4726ae657f7b5b8b048f9f64ccf2 (diff) | |
| download | servo-4e37d07ea4f2bba124f78f17873fbb02c66d1cdb.tar.gz servo-4e37d07ea4f2bba124f78f17873fbb02c66d1cdb.zip | |
Auto merge of #29699 - mrobinson:add-html-body-tag, r=mukilan
Detect body elements during layout
During layout it is often useful, for various specification reasons, to know if an element is the `<body>` element of an `<html>` element root. There are a couple places where a brittle heuristic is used to detect `<body>` elements. This information is going to be even more important to properly handle `<html>` elements that inherit their overflow property from their `<body>` children.
Implementing this properly requires updating the DOM wrapper interface. This check does reach up to the parent of thread-safe nodes, but this is essentially the same kind of operation that `parent_style()` does, so is ostensibly safe.
This change should not change any behavior and is just a preparation step for properly handle `<body>` overflow.
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes do not require tests because it does not change behavior.
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'components/layout_2020/dom_traversal.rs')
| -rw-r--r-- | components/layout_2020/dom_traversal.rs | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/components/layout_2020/dom_traversal.rs b/components/layout_2020/dom_traversal.rs index 2e1d81ad8fb..a41bead9d0f 100644 --- a/components/layout_2020/dom_traversal.rs +++ b/components/layout_2020/dom_traversal.rs @@ -5,6 +5,7 @@ use crate::cell::ArcRefCell; use crate::context::LayoutContext; use crate::element_data::{LayoutBox, LayoutDataForElement}; +use crate::fragment_tree::{BaseFragmentInfo, FragmentFlags, Tag}; use crate::geom::PhysicalSize; use crate::replaced::{CanvasInfo, CanvasSource, ReplacedContent}; use crate::style_ext::{Display, DisplayGeneratingBox, DisplayInside, DisplayOutside}; @@ -74,6 +75,31 @@ impl<Node: Clone> NodeAndStyleInfo<Node> { } } +impl<'dom, Node> From<&NodeAndStyleInfo<Node>> for BaseFragmentInfo +where + Node: NodeExt<'dom>, +{ + fn from(info: &NodeAndStyleInfo<Node>) -> Self { + let pseudo = info.pseudo_element_type.map(|pseudo| match pseudo { + WhichPseudoElement::Before => PseudoElement::Before, + WhichPseudoElement::After => PseudoElement::After, + }); + + let threadsafe_node = info.node.to_threadsafe(); + let flags = match threadsafe_node.as_element() { + Some(element) if element.is_body_element_of_html_element_root() => { + FragmentFlags::IS_BODY_ELEMENT_OF_HTML_ELEMENT_ROOT + }, + _ => FragmentFlags::empty(), + }; + + Self { + tag: Tag::new_pseudo(threadsafe_node.opaque(), pseudo), + flags, + } + } +} + pub(super) enum Contents { /// Refers to a DOM subtree, plus `::before` and `::after` pseudo-elements. OfElement, |