Changeset 285211 in webkit

Timestamp:

Nov 3, 2021 9:59:48 AM (9 months ago)

Author:

Antti Koivisto

Message:

::slotted element style not invalidated correctly in nested case
​https://bugs.webkit.org/show_bug.cgi?id=232665

Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

• web-platform-tests/css/css-scoping/slotted-nested-expected.txt:

Source/WebCore:

We fail to invalidate ::slotted style if the assigned node is not from the current host scope.

• style/StyleInvalidator.cpp:

(WebCore::Style::invalidateAssignedElements):

Invalidate more accurately by following assigned node chain recursively instead of just invalidating all host children.

(WebCore::Style::Invalidator::invalidateIfNeeded):

Remove the unnecessary and incorrect m_didInvalidateHostChildren optimization.

• style/StyleInvalidator.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/css-scoping/slotted-nested-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/StyleInvalidator.cpp (modified) (2 diffs)
• Source/WebCore/style/StyleInvalidator.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-11-03  Antti Koivisto  <antti@apple.com>
+
+        ::slotted element style not invalidated correctly in nested case
+        https://bugs.webkit.org/show_bug.cgi?id=232665
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-scoping/slotted-nested-expected.txt:
+
 2021-11-03  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scoping/slotted-nested-expected.txt

@@ -3 +3 @@
 
 PASS Slotted matches rules against the slot in the right tree
-FAIL Style invalidation works correctly for nested slots assert_not_equals: got disallowed value "rgb(0, 128, 0)"
+PASS Style invalidation works correctly for nested slots
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-03  Antti Koivisto  <antti@apple.com>
+
+        ::slotted element style not invalidated correctly in nested case
+        https://bugs.webkit.org/show_bug.cgi?id=232665
+
+        Reviewed by Simon Fraser.
+
+        We fail to invalidate ::slotted style if the assigned node is not from the current host scope.
+
+        * style/StyleInvalidator.cpp:
+        (WebCore::Style::invalidateAssignedElements):
+
+        Invalidate more accurately by following assigned node chain recursively instead of just invalidating all host children.
+
+        (WebCore::Style::Invalidator::invalidateIfNeeded):
+
+        Remove the unnecessary and incorrect m_didInvalidateHostChildren optimization.
+
+        * style/StyleInvalidator.h:
+
 2021-11-03  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/style/StyleInvalidator.cpp

@@ -129 +129 @@
 }
 
+static void invalidateAssignedElements(HTMLSlotElement& slot)
+{
+    auto* assignedNodes = slot.assignedNodes();
+    if (!assignedNodes)
+        return;
+    for (auto& node : *assignedNodes) {
+        if (!is<Element>(node.get()))
+            continue;
+        if (is<HTMLSlotElement>(*node) && node->containingShadowRoot()) {
+            invalidateAssignedElements(downcast<HTMLSlotElement>(*node));
+            continue;
+        }
+        downcast<Element>(*node).invalidateStyleInternal();
+    }
+}
+
 Invalidator::CheckDescendants Invalidator::invalidateIfNeeded(Element& element, const SelectorFilter* filter)
 {
     invalidateInShadowTreeIfNeeded(element);
 
-    bool shouldCheckForSlots = m_ruleInformation.hasSlottedPseudoElementRules && !m_didInvalidateHostChildren;
-    if (shouldCheckForSlots && is<HTMLSlotElement>(element)) {
-        auto* containingShadowRoot = element.containingShadowRoot();
-        if (containingShadowRoot && containingShadowRoot->host()) {
-            for (auto& possiblySlotted : childrenOfType<Element>(*containingShadowRoot->host()))
-                possiblySlotted.invalidateStyleInternal();
-        }
-        // No need to do this again.
-        m_didInvalidateHostChildren = true;
-    }
+    if (m_ruleInformation.hasSlottedPseudoElementRules && is<HTMLSlotElement>(element))
+        invalidateAssignedElements(downcast<HTMLSlotElement>(element));
 
     switch (element.styleValidity()) {
@@ -162 +170 @@
     case Style::Validity::SubtreeInvalid:
     case Style::Validity::SubtreeAndRenderersInvalid:
-        if (shouldCheckForSlots)
-            return CheckDescendants::Yes;
         return CheckDescendants::No;
     }

trunk/Source/WebCore/style/StyleInvalidator.h

@@ -91 +91 @@
 
     bool m_dirtiesAllStyle { false };
-    bool m_didInvalidateHostChildren { false };
 };