wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-16 04:07:31 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1592 - Part 5: Use flattened element tree when looking for a parent while matching ::slotted()

Browse source
This commit is contained in:
FranklinDM 2023-03-18 23:08:00 +08:00 • committed by roytam1
commit 8d2533ad70
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
layout/style/nsCSSRuleProcessor.cpp
View file

@ -2566,6 +2566,11 @@ SelectorMatchesTree(Element* aPrevElement,
// The relevant link must be an ancestor of the node being matched. // The relevant link must be an ancestor of the node being matched.
aFlags = SelectorMatchesTreeFlags(aFlags & ~eLookForRelevantLink); aFlags = SelectorMatchesTreeFlags(aFlags & ~eLookForRelevantLink);
nsIContent* parent = prevElement->GetParent(); nsIContent* parent = prevElement->GetParent();
// Operate on the flattened element tree when matching the
// ::slotted() pseudo-element.
if (aTreeMatchContext.mRestrictToSlottedPseudo) {
parent = prevElement->GetFlattenedTreeParent();
}
if (parent) { if (parent) {
if (aTreeMatchContext.mForStyling) if (aTreeMatchContext.mForStyling)
parent->SetFlags(NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS); parent->SetFlags(NODE_HAS_SLOW_SELECTOR_LATER_SIBLINGS);
@ -2576,7 +2581,12 @@ SelectorMatchesTree(Element* aPrevElement,
// for descendant combinators and child combinators, the element // for descendant combinators and child combinators, the element
// to test against is the parent // to test against is the parent
else { else {
nsIContent *content = prevElement->GetParent(); nsIContent* content = prevElement->GetParent();
// Operate on the flattened element tree when matching the
// ::slotted() pseudo-element.
if (aTreeMatchContext.mRestrictToSlottedPseudo) {
content = prevElement->GetFlattenedTreeParent();
}
// In the shadow tree, the shadow host behaves as if it // In the shadow tree, the shadow host behaves as if it
// is a featureless parent of top-level elements of the shadow // is a featureless parent of top-level elements of the shadow
@ -2584,11 +2594,12 @@ SelectorMatchesTree(Element* aPrevElement,
// left most selector because ancestors of the host are not in // left most selector because ancestors of the host are not in
// the selector match list. // the selector match list.
ShadowRoot* shadowRoot = content ? ShadowRoot* shadowRoot = content ?
ShadowRoot::FromNode(content) : nullptr; ShadowRoot::FromNode(content) :
nullptr;
if (shadowRoot && !selector->mNext && !crossedShadowRootBoundary) { if (shadowRoot && !selector->mNext && !crossedShadowRootBoundary) {
content = shadowRoot->GetHost(); content = shadowRoot->GetHost();
crossedShadowRootBoundary = true; crossedShadowRootBoundary = true;
contentIsFeatureless = true; contentIsFeatureless = true;
} }
// GetParent could return a document fragment; we only want // GetParent could return a document fragment; we only want