RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 16:17:45 +00:00
Code Issues Activity Actions

LibWeb: Only propagate CSS overflow to the viewport once per tree build

Browse source 
Before this change, we were doing it after every layout, which meant
that already-propagated overflow could be propagated again, which led to
incorrect scrolling behavior.
This commit is contained in:
Andreas Kling 2023-11-02 20:08:02 +01:00
parent bc6f19da0e
commit f9cab320e6
5 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibWeb/Layout/expected/replaced-within-max-content.txt
View file

@ -8,7 +8,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
frag 0 from ImageBox start: 0, length: 0, rect: [8,8 150x150] frag 0 from ImageBox start: 0, length: 0, rect: [8,8 150x150]
ImageBox <img.replaced> at (8,8) content-size 150x150 children: not-inline ImageBox <img.replaced> at (8,8) content-size 150x150 children: not-inline
(SVG-as-image isolated context) (SVG-as-image isolated context)
Viewport <#document> at (0,0) content-size 150x150 children: inline Viewport <#document> at (0,0) content-size 150x150 [BFC] children: inline
SVGSVGBox <svg> at (0,0) content-size 150x150 [SVG] children: not-inline SVGSVGBox <svg> at (0,0) content-size 150x150 [SVG] children: not-inline
SVGGeometryBox <path> at (0,0) content-size 150x150 children: not-inline SVGGeometryBox <path> at (0,0) content-size 150x150 children: not-inline
TextNode <#text> TextNode <#text>

2
Tests/LibWeb/Layout/expected/svg/svg-as-image-implicit-viewbox.txt
View file

@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x100 children: not-inline BlockContainer <body> at (8,8) content-size 784x100 children: not-inline
ImageBox <img> at (8,8) content-size 50x100 children: not-inline ImageBox <img> at (8,8) content-size 50x100 children: not-inline
(SVG-as-image isolated context) (SVG-as-image isolated context)
Viewport <#document> at (0,0) content-size 50x100 children: inline Viewport <#document> at (0,0) content-size 50x100 [BFC] children: inline
SVGSVGBox <svg> at (0,0) content-size 50x100 [SVG] children: not-inline SVGSVGBox <svg> at (0,0) content-size 50x100 [SVG] children: not-inline
SVGGeometryBox <rect> at (0,0) content-size 50x100 children: not-inline SVGGeometryBox <rect> at (0,0) content-size 50x100 children: not-inline

2
Tests/LibWeb/Layout/expected/svg/svg-as-image.txt
View file

@ -3,7 +3,7 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
BlockContainer <body> at (8,8) content-size 784x1568 children: not-inline BlockContainer <body> at (8,8) content-size 784x1568 children: not-inline
ImageBox <img> at (8,8) content-size 784x1568 children: not-inline ImageBox <img> at (8,8) content-size 784x1568 children: not-inline
(SVG-as-image isolated context) (SVG-as-image isolated context)
Viewport <#document> at (0,0) content-size 784x1568 children: inline Viewport <#document> at (0,0) content-size 784x1568 [BFC] children: inline
SVGSVGBox <svg> at (0,0) content-size 784x1568 [SVG] children: inline SVGSVGBox <svg> at (0,0) content-size 784x1568 [SVG] children: inline
TextNode <#text> TextNode <#text>
SVGGeometryBox <rect> at (0,0) content-size 784x1568 children: not-inline SVGGeometryBox <rect> at (0,0) content-size 784x1568 children: not-inline

6
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -984,10 +984,10 @@ void Document::update_layout()
if (!m_layout_root) { if (!m_layout_root) {
Layout::TreeBuilder tree_builder; Layout::TreeBuilder tree_builder;
m_layout_root = verify_cast<Layout::Viewport>(*tree_builder.build(*this)); m_layout_root = verify_cast<Layout::Viewport>(*tree_builder.build(*this));
}
if (auto* document_element = this->document_element()) { if (auto* document_element = this->document_element()) {
propagate_overflow_to_viewport(*document_element, *m_layout_root); propagate_overflow_to_viewport(*document_element, *m_layout_root);
}
} }
Layout::LayoutState layout_state; Layout::LayoutState layout_state;

7
Userland/Libraries/LibWeb/DOM/Element.cpp
View file

@ -542,6 +542,13 @@ static Element::RequiredInvalidationAfterStyleChange compute_required_invalidati
return Element::RequiredInvalidationAfterStyleChange::full(); return Element::RequiredInvalidationAfterStyleChange::full();
} }
// NOTE: If one of the overflow properties change, we rebuild the entire layout tree.
// This ensures that overflow propagation from root/body to viewport happens correctly.
// In the future, we can make this invalidation narrower.
if (property_id == CSS::PropertyID::OverflowX || property_id == CSS::PropertyID::OverflowY) {
return Element::RequiredInvalidationAfterStyleChange::full();
}
// OPTIMIZATION: Special handling for CSS `visibility`: // OPTIMIZATION: Special handling for CSS `visibility`:
if (property_id == CSS::PropertyID::Visibility) { if (property_id == CSS::PropertyID::Visibility) {
// We don't need to relayout if the visibility changes from visible to hidden or vice versa. Only collapse requires relayout. // We don't need to relayout if the visibility changes from visible to hidden or vice versa. Only collapse requires relayout.