layout: Correctly repair OutsideMarker::list_item_style#42825
Merged
Loirooriol merged 1 commit intoservo:mainfrom Feb 25, 2026
Merged
layout: Correctly repair OutsideMarker::list_item_style#42825Loirooriol merged 1 commit intoservo:mainfrom
OutsideMarker::list_item_style#42825Loirooriol merged 1 commit intoservo:mainfrom
Conversation
Loirooriol
added
A-layout/2020
|
🔨 Triggering try run (#22374086485) for Linux (WPT) |
Loirooriol
force-pushed
the
marker-repair-parent-style
branch
2 times, most recently
from
4e16fc7 to
822a403
Compare
Collaborator
|
🤖 Opened new upstream WPT pull request (web-platform-tests/wpt#58021) with upstreamable changes. |
|
|
|
🔨 Triggering try run (#22374216628) for Linux (WPT) |
Collaborator
|
📝 Transplanted new upstreamable changes to existing upstream WPT pull request (web-platform-tests/wpt#58021). |
|
Test results for linux-wpt from try job (#22374216628): Flaky unexpected result (28)
Stable unexpected results that are known to be intermittent (19)
|
|
✨ Try run (#22374216628) succeeded. |
servo-highfive
added
the
S-awaiting-review
mrobinson
approved these changes
Feb 25, 2026
Comment on lines
+335
to
+340
| fn parent_style(&self, context: &SharedStyleContext) -> Arc<ComputedValues> { | ||
| if let Some(chain) = self.pseudo_element_chain.without_innermost() { | ||
| let mut parent = *self; | ||
| parent.pseudo_element_chain = chain; | ||
| return parent.style(context); | ||
| } |
Member
There was a problem hiding this comment.
This is unfortunate, but I don't see a better option.
Comment on lines
+434
to
+437
| Some(match self.secondary { | ||
| Some(_) => Self::unnested(primary), | ||
| None => Self::default(), | ||
| }) |
Member
There was a problem hiding this comment.
Suggested change
| Some(match self.secondary { | |
| Some(_) => Self::unnested(primary), | |
| None => Self::default(), | |
| }) | |
| self.secondary.and_then(|| Self::unnested(primary)).unwrap_or_default(); |
Contributor
Author
There was a problem hiding this comment.
This doesn't work, I will use
Some(
self.secondary
.map_or_else(Self::default, |_| Self::unnested(primary)),
)
servo-highfive
removed
the
S-awaiting-review
`OutsideMarker::repair_style()` was setting `list_item_style` to the style of the marker, not the style of the list item. This patch sets it to `node.parent_style(context)` instead, and it fixes `ServoThreadSafeLayoutNode::parent_style()` to take the pseudo-element chain into account. This requires modifying a bunch of logic to pass the `SharedStyleContext` around. Signed-off-by: Oriol Brufau <obrufau@igalia.com>
Loirooriol
force-pushed
the
marker-repair-parent-style
branch
from
822a403 to
5b06e5a
Compare
servo-highfive
added
the
S-awaiting-review
Collaborator
|
📝 Transplanted new upstreamable changes to existing upstream WPT pull request (web-platform-tests/wpt#58021). |
servo-highfive
added
the
S-awaiting-merge
github-merge-queue
Bot
removed this pull request from the merge queue due to failed status checks
servo-highfive
removed
the
S-awaiting-merge
servo-highfive
added
the
S-tests-failed
servo-highfive
added
S-awaiting-merge
servo-highfive
removed
the
S-awaiting-merge
shubhamg13
pushed a commit
to shubhamg13/servo
that referenced
this pull request
Mar 2, 2026
`OutsideMarker::repair_style()` was setting `list_item_style` to the style of the marker, not the style of the list item. This patch sets it to `node.parent_style(context)` instead, and it fixes `ServoThreadSafeLayoutNode::parent_style()` to take the pseudo-element chain into account. This requires modifying a bunch of logic to pass the `SharedStyleContext` around. Testing: Adding a new test Signed-off-by: Oriol Brufau <obrufau@igalia.com>
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
4 participants
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.
OutsideMarker::repair_style()was settinglist_item_styleto the style of the marker, not the style of the list item.This patch sets it to
node.parent_style(context)instead, and it fixesServoThreadSafeLayoutNode::parent_style()to take the pseudo-element chain into account. This requires modifying a bunch of logic to pass theSharedStyleContextaround.Testing: Adding a new test