layout: Remove box damage for parent when we can reuse the box#42847
Merged
Loirooriol merged 1 commit intoservo:mainfrom Feb 26, 2026
Merged
layout: Remove box damage for parent when we can reuse the box#42847Loirooriol merged 1 commit intoservo:mainfrom
Loirooriol merged 1 commit intoservo:mainfrom
Conversation
|
🔨 Triggering try run (#22396819828) for Linux (WPT) |
|
Test results for linux-wpt from try job (#22396819828): Flaky unexpected result (27)
Stable unexpected results that are known to be intermittent (19)
Stable unexpected results (4)
|
|
|
3f06c81 to
7508798
Compare
|
🔨 Triggering try run (#22450879298) for Linux (WPT) |
Collaborator
|
🤖 Opened new upstream WPT pull request (web-platform-tests/wpt#58075) with upstreamable changes. |
|
🔨 Triggering try run (#22451124643) for Linux (WPT) |
Collaborator
|
✍ Updated existing upstream WPT pull request (web-platform-tests/wpt#58075) title and body. |
This fixes an oversight from servo#42783: when detecting that a box can be reused, we weren't clearing the box damage propagated to ancestors, so ancestors were still recollecting children. Co-authored-by: Luke Warlow <[email protected]> Co-authored-by: Martin Robinson <[email protected]> Signed-off-by: Oriol Brufau <[email protected]>
7508798 to
be22d22
Compare
Collaborator
|
📝 Transplanted new upstreamable changes to existing upstream WPT pull request (web-platform-tests/wpt#58075). |
mrobinson
approved these changes
Feb 26, 2026
|
Test results for linux-wpt from try job (#22450879298): Flaky unexpected result (23)
Stable unexpected results that are known to be intermittent (23)
Stable unexpected results (2)
|
|
|
|
|
Contributor
Author
|
The tests pass locally, I guess it's just that I triggered them before rebasing |
shubhamg13
pushed a commit
to shubhamg13/servo
that referenced
this pull request
Mar 2, 2026
…#42847) This fixes an oversight from servo#42783: when detecting that a box can be reused, we weren't clearing the box damage propagated to ancestors, so ancestors were still recollecting children. This exposed some problems in `rebuild_box_tree_from_independent_formatting_context()`: 1. When reusing a block-level box that established an independent formatting context, we weren't checking that the new style was still block-level. 2. When reusing a block-level abspos box, we weren't checking if the new original display was inline-level, preventing it from being handled as a block-level because of the static position. 3. When reusing a flex item, we weren't checking if the `order` had changed. Testing: we have test coverage for the 3 problems above: 1. Covered by `/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html`, and also adding a new `/css/css-display/display-flow-root-dynamic.html`. 2. Covered by `/css/CSS2/abspos/hypothetical-box-dynamic.html` 3. Covered by `/css/css-display/order-dynamic.html`. Signed-off-by: Oriol Brufau <[email protected]> Co-authored-by: Luke Warlow <[email protected]> Co-authored-by: Martin Robinson <[email protected]>
mrobinson
added a commit
to mrobinson/servo
that referenced
this pull request
Mar 2, 2026
This change includes two related fixes for flakiness revealed by servo#42847. 1. When caching fonts, try harder to not re-cache a font. This could happen due to a race condition with the read-write lock on the font cache. This change improves memory usage in some cases as it prevents a font from being loaded twice. 2. Incorporate both the strut size and the block size contribution of a previously unused font in an inline container. Before the code was incorporating one or the other. In addition, *only* incorporate the block contribution of a previously unused font if its metrics meaningfully differ from the container's default font. This was the case triggered by failing to have the fix in part one of the change. Co-authored-by: Oriol Brufau <[email protected]> Co-authored-by: Luke Warlow <[email protected]> Signed-off-by: Martin Robinson <[email protected]>
github-merge-queue bot
pushed a commit
that referenced
this pull request
Mar 3, 2026
#42960) This change includes two related fixes for flakiness revealed by #42847. 1. When caching fonts, try harder to not re-cache a font. This could happen due to a race condition with the read-write lock on the font cache. This change improves memory usage in some cases as it prevents a font from being loaded twice. 2. Incorporate both the strut size and the block size contribution of a previously unused font in an inline container. Before the code was incorporating one or the other. In addition, *only* incorporate the block contribution of a previously unused font if its metrics meaningfully differ from the container's default font. This was the case triggered by failing to have the fix in part one of the change. Testing: This fixes flakiness in an internal WPT-style test. Fixes: #42908. Signed-off-by: Martin Robinson <[email protected]> Co-authored-by: Oriol Brufau <[email protected]> Co-authored-by: Luke Warlow <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes an oversight from #42783: when detecting that a box can be reused, we weren't clearing the box damage propagated to ancestors, so ancestors were still recollecting children.
This exposed some problems in
rebuild_box_tree_from_independent_formatting_context():orderhad changed.Testing: we have test coverage for the 3 problems above:
/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/legend-display.html, and also adding a new/css/css-display/display-flow-root-dynamic.html./css/CSS2/abspos/hypothetical-box-dynamic.html/css/css-display/order-dynamic.html.