selectors::Element::parent() shouldn't cross shadow tree boundary#40977
Merged
yezhizhen merged 2 commits intoservo:mainfrom Dec 4, 2025
Merged
selectors::Element::parent() shouldn't cross shadow tree boundary#40977yezhizhen merged 2 commits intoservo:mainfrom
yezhizhen merged 2 commits intoservo:mainfrom
Conversation
servo-highfive
added
the
S-awaiting-review
|
🔨 Triggering try run (#19816468662) for Linux (WPT) |
yezhizhen
approved these changes
Dec 1, 2025
servo-highfive
removed
the
S-awaiting-review
|
Test results for linux-wpt from try job (#19816468662): Flaky unexpected result (42)
Stable unexpected results that are known to be intermittent (16)
|
|
✨ Try run (#19816468662) succeeded. |
longvatrong111
force-pushed
the
descendant-combinator-shadowtree
branch
from
e3f66c5 to
15e158f
Compare
servo-highfive
added
the
S-awaiting-review
|
🔨 Triggering try run (#19818628609) for Linux (WPT) |
|
Test results for linux-wpt from try job (#19818628609): Flaky unexpected result (27)
Stable unexpected results that are known to be intermittent (17)
|
|
✨ Try run (#19818628609) succeeded. |
emilio
requested changes
Dec 1, 2025
| } | ||
|
|
||
| fn parent_element(&self) -> Option<Self> { | ||
| ServoLayoutElement::parent_element(self) |
Member
There was a problem hiding this comment.
Let's fix ServoLayoutElement::parent_element instead, it shouldn't use the composed tree. inheritance_parent should tho.
servo-highfive
added
S-needs-code-changes
Member
|
So something along these lines: diff --git a/components/script/layout_dom/element.rs b/components/script/layout_dom/element.rs
index 14a6809df14..45179d2cd96 100644
--- a/components/script/layout_dom/element.rs
+++ b/components/script/layout_dom/element.rs
@@ -135,10 +135,7 @@ impl<'dom> ServoLayoutElement<'dom> {
/// Returns the parent element of this element, if it has one.
fn parent_element(&self) -> Option<Self> {
- self.element
- .upcast()
- .composed_parent_node_ref()
- .and_then(|node| node.downcast().map(ServoLayoutElement::from_layout_js))
+ self.as_node().parent_element()
}
fn is_root(&self) -> bool {
@@ -220,9 +217,7 @@ impl<'dom> style::dom::TElement for ServoLayoutElement<'dom> {
return self.pseudo_element_originating_element();
}
- // FIXME: By default the inheritance parent would be the Self::parent_element
- // but probably we should use the flattened tree parent.
- self.parent_element()
+ self.traversal_parent()
}
fn is_html_element(&self) -> bool {
@@ -711,7 +706,7 @@ impl<'dom> ::selectors::Element for ServoLayoutElement<'dom> {
}
fn parent_element(&self) -> Option<Self> {
- ServoLayoutElement::parent_element(self)
+ self.as_node().parent_element()
}
fn parent_node_is_shadow_root(&self) -> bool { |
Signed-off-by: batu_hoang <[email protected]>
longvatrong111
force-pushed
the
descendant-combinator-shadowtree
branch
from
15e158f to
f897428
Compare
servo-highfive
added
S-awaiting-review
|
🔨 Triggering try run (#19870931259) for Linux (WPT) |
|
Test results for linux-wpt from try job (#19870931259): Flaky unexpected result (31)
Stable unexpected results that are known to be intermittent (25)
Stable unexpected results (3)
|
|
|
emilio
approved these changes
Dec 2, 2025
Member
emilio
left a comment
emilio
left a comment
There was a problem hiding this comment.
Seem like mostly more passes, nice.
servo-highfive
removed
the
S-awaiting-review
Contributor
Author
We can mark it fail now and address it in another issue. |
Signed-off-by: batu_hoang <[email protected]>
servo-highfive
added
the
S-awaiting-review
|
🔨 Triggering try run (#19906184653) for Linux (WPT) |
|
Test results for linux-wpt from try job (#19906184653): Flaky unexpected result (36)
Stable unexpected results that are known to be intermittent (22)
|
|
✨ Try run (#19906184653) succeeded. |
Member
|
Can you fix the PR body? |
Member
Update this too. More passing and one failing |
Contributor
Author
@yezhizhen thank you, updated. |
servo-highfive
added
the
S-awaiting-merge
servo-highfive
removed
the
S-awaiting-merge
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.
ServoLayoutElement::parent_element() method shouldn't cross shadow tree boundary.
inheritance_parentusestraversal_parentTesting:
tests/wpt/meta/css/css-lists/counter-list-item-slot-order.html.initests/wpt/meta/css/css-nesting/host-nesting-003.html.initests/wpt/meta/css/selectors/is-where-shadow.html.iniand manual test in the below issue
The regression in
tests/wpt/meta/html/rendering/the-details-element/details-blockification.html.inihas 1 more cause #40977 (comment)Fixes: #40896
cc: @xiaochengh