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/replaced.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/replaced.rs')
| -rw-r--r-- | components/layout_2020/replaced.rs | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/components/layout_2020/replaced.rs b/components/layout_2020/replaced.rs index 907af6e67e9..0bea12eaf2d 100644 --- a/components/layout_2020/replaced.rs +++ b/components/layout_2020/replaced.rs @@ -4,7 +4,8 @@ use crate::context::LayoutContext; use crate::dom_traversal::NodeExt; -use crate::fragments::{DebugId, Fragment, IFrameFragment, ImageFragment}; +use crate::fragment_tree::BaseFragmentInfo; +use crate::fragments::{Fragment, IFrameFragment, ImageFragment}; use crate::geom::flow_relative::{Rect, Vec2}; use crate::geom::PhysicalSize; use crate::sizing::ContentSizes; @@ -29,6 +30,7 @@ use webrender_api::ImageKey; pub(crate) struct ReplacedContent { pub kind: ReplacedContentKind, intrinsic: IntrinsicSizes, + base_fragment_info: BaseFragmentInfo, } /// * Raster images always have an intrinsic width and height, with 1 image pixel = 1px. @@ -140,7 +142,12 @@ impl ReplacedContent { }, ); - return Some(Self { kind, intrinsic }); + let base_fragment_info = BaseFragmentInfo::new_for_node(element.as_opaque()); + return Some(Self { + kind, + intrinsic, + base_fragment_info, + }); } pub fn from_image_url<'dom>( @@ -171,6 +178,7 @@ impl ReplacedContent { // FIXME https://github.com/w3c/csswg-drafts/issues/4572 ratio: Some(width / height), }, + base_fragment_info: BaseFragmentInfo::new_for_node(element.as_opaque()), }); } None @@ -219,7 +227,7 @@ impl ReplacedContent { .and_then(|image| image.id) .map(|image_key| { Fragment::Image(ImageFragment { - debug_id: DebugId::new(), + base: self.base_fragment_info.into(), style: style.clone(), rect: Rect { start_corner: Vec2::zero(), @@ -232,7 +240,7 @@ impl ReplacedContent { .collect(), ReplacedContentKind::IFrame(iframe) => { vec![Fragment::IFrame(IFrameFragment { - debug_id: DebugId::new(), + base: self.base_fragment_info.into(), style: style.clone(), pipeline_id: iframe.pipeline_id, browsing_context_id: iframe.browsing_context_id, @@ -268,7 +276,7 @@ impl ReplacedContent { }, }; vec![Fragment::Image(ImageFragment { - debug_id: DebugId::new(), + base: self.base_fragment_info.into(), style: style.clone(), rect: Rect { start_corner: Vec2::zero(), |