Changeset 286063 in webkit

Timestamp:

Nov 19, 2021, 8:53:01 AM (5 years ago)

Author:

Antti Koivisto

Message:

:hover with descendant selector not invalidated correctly in shadow tree
​https://bugs.webkit.org/show_bug.cgi?id=233354

Reviewed by Antoine Quint.

Source/WebCore:

We optimize :hover and :active by only invalidating for descendant selectors with a single tree walk.
This doesn't work correctly for shadow trees as their scoped style may differ and the invalidation
is limited to a single scope anyway.

Fix by doing descendant invalidation for each affected scope.

Test: fast/selectors/hover-descendant-shadow-tree.html

• dom/Document.cpp:

(WebCore::Document::updateHoverActiveState):

We need to perform scoped descendant invalidation for elements that are parented to ShadowRoot.

LayoutTests:

• fast/selectors/hover-descendant-shadow-tree-expected.html: Added.
• fast/selectors/hover-descendant-shadow-tree.html: Added.
• platform/ios/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/selectors/hover-descendant-shadow-tree-expected.html (added)
• LayoutTests/fast/selectors/hover-descendant-shadow-tree.html (added)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/dom/Document.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-11-19  Antti Koivisto  <antti@apple.com>
+
+        :hover with descendant selector not invalidated correctly in shadow tree
+        https://bugs.webkit.org/show_bug.cgi?id=233354
+
+        Reviewed by Antoine Quint.
+
+        * fast/selectors/hover-descendant-shadow-tree-expected.html: Added.
+        * fast/selectors/hover-descendant-shadow-tree.html: Added.
+        * platform/ios/TestExpectations:
+
 2021-11-19  Arcady Goldmints-Orlov  <agoldmints@igalia.com>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -711 +711 @@
 fast/selectors/active-quirks.html [ Skip ]
 fast/selectors/active-strict.html [ Skip ]
+fast/selectors/hover-descendant-shadow-tree.html [ Skip ]
 fast/selectors/hover-invalidation-descendant-clear.html [ Skip ]
 fast/selectors/hover-invalidation-descendant-dynamic.html [ Skip ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-19  Antti Koivisto  <antti@apple.com>
+
+        :hover with descendant selector not invalidated correctly in shadow tree
+        https://bugs.webkit.org/show_bug.cgi?id=233354
+
+        Reviewed by Antoine Quint.
+
+        We optimize :hover and :active by only invalidating for descendant selectors with a single tree walk.
+        This doesn't work correctly for shadow trees as their scoped style may differ and the invalidation
+        is limited to a single scope anyway.
+
+        Fix by doing descendant invalidation for each affected scope.
+
+        Test: fast/selectors/hover-descendant-shadow-tree.html
+
+        * dom/Document.cpp:
+        (WebCore::Document::updateHoverActiveState):
+
+        We need to perform scoped descendant invalidation for elements that are parented to ShadowRoot.
+
 2021-11-19  Matt Woodrow  <matt.woodrow@gmail.com>
 

trunk/Source/WebCore/dom/Document.cpp

@@ -7481 +7481 @@
         if (elements.isEmpty())
             return;
+
         Style::PseudoClassChangeInvalidation styleInvalidation { *elements.last(), pseudoClassType, Style::InvalidationScope::Descendants };
+
+        // We need to do descendant invalidation for each shadow tree separately as the style is per-scope.
+        Vector<Style::PseudoClassChangeInvalidation> shadowDescendantStyleInvalidations;
+        for (auto& element : elements) {
+            if (hasShadowRootParent(*element))
+                shadowDescendantStyleInvalidations.append({ *element, pseudoClassType, Style::InvalidationScope::Descendants });
+        }
+
         for (auto& element : elements)
             setter(*element);