Changeset 208610 in webkit

Timestamp:

Nov 11, 2016 1:59:33 PM (7 years ago)

Author:

Antti Koivisto

Message:

Shadow DOM: Toggling class in .class ::slotted(*) does not trigger style recalc
​https://bugs.webkit.org/show_bug.cgi?id=160864

Reviewed by Ryosuke Niwa.

Source/WebCore:

Also fix similar issue with ::host

Test: fast/shadow-dom/css-scoping-host-and-slotted-context-invalidation.html

• css/StyleInvalidationAnalysis.cpp:

(WebCore::StyleInvalidationAnalysis::invalidateIfNeeded):

If we have ::slotted rules and encounter a <slot>, invalidate the slotted host children.

(WebCore::StyleInvalidationAnalysis::invalidateStyle):

Invalidate the shadow host if we have ::host rules.

• css/StyleInvalidationAnalysis.h:
• dom/InlineStyleSheetOwner.cpp:

(WebCore::InlineStyleSheetOwner::createSheet):

Fix a bug where it was possible to mutate stylesheets in the inline stylesheet cache.
The included test covers this.

• style/StyleScope.cpp:

(WebCore::Style::Scope::updateActiveStyleSheets):

Handle the full invalidation case.

LayoutTests:

• fast/shadow-dom/css-scoping-host-and-slotted-context-invalidation-expected.html: Added.
• fast/shadow-dom/css-scoping-host-and-slotted-context-invalidation.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (2 diffs)
• LayoutTests/fast/shadow-dom/css-scoping-host-and-slotted-context-invalidation-expected.html (added)
• LayoutTests/fast/shadow-dom/css-scoping-host-and-slotted-context-invalidation.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/StyleInvalidationAnalysis.cpp (modified) (4 diffs)
• Source/WebCore/css/StyleInvalidationAnalysis.h (modified) (1 diff)
• Source/WebCore/dom/InlineStyleSheetOwner.cpp (modified) (1 diff)
• Source/WebCore/style/StyleScope.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-11-11  Antti Koivisto  <antti@apple.com>
+
+        Shadow DOM: Toggling class in `.class ::slotted(*)` does not trigger style recalc
+        https://bugs.webkit.org/show_bug.cgi?id=160864
+
+        Reviewed by Ryosuke Niwa.
+
+        * fast/shadow-dom/css-scoping-host-and-slotted-context-invalidation-expected.html: Added.
+        * fast/shadow-dom/css-scoping-host-and-slotted-context-invalidation.html: Added.
+
 2016-11-11  Eric Carlson  <eric.carlson@apple.com>
 
@@ -1201 +1211 @@
         * fast/shadow-dom/css-scoping-slot-with-id-expected.html: Added.
         * fast/shadow-dom/css-scoping-slot-with-id.html: Added.
+
 
 2016-11-04  Brady Eidson  <beidson@apple.com>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-11-11  Antti Koivisto  <antti@apple.com>
+
+        Shadow DOM: Toggling class in `.class ::slotted(*)` does not trigger style recalc
+        https://bugs.webkit.org/show_bug.cgi?id=160864
+
+        Reviewed by Ryosuke Niwa.
+
+        Also fix similar issue with ::host
+
+        Test: fast/shadow-dom/css-scoping-host-and-slotted-context-invalidation.html
+
+        * css/StyleInvalidationAnalysis.cpp:
+        (WebCore::StyleInvalidationAnalysis::invalidateIfNeeded):
+
+            If we have ::slotted rules and encounter a <slot>, invalidate the slotted host children.
+
+        (WebCore::StyleInvalidationAnalysis::invalidateStyle):
+
+            Invalidate the shadow host if we have ::host rules.
+
+        * css/StyleInvalidationAnalysis.h:
+        * dom/InlineStyleSheetOwner.cpp:
+        (WebCore::InlineStyleSheetOwner::createSheet):
+
+            Fix a bug where it was possible to mutate stylesheets in the inline stylesheet cache.
+            The included test covers this.
+
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::updateActiveStyleSheets):
+
+            Handle the full invalidation case.
+
 2016-11-11  Brady Eidson  <beidson@apple.com>
 

trunk/Source/WebCore/css/StyleInvalidationAnalysis.cpp

@@ -31 +31 @@
 #include "ElementIterator.h"
 #include "ElementRuleCollector.h"
+#include "HTMLSlotElement.h"
 #include "SelectorFilter.h"
 #include "ShadowRoot.h"
@@ -104 +105 @@
     }
 
+    bool shouldCheckForSlots = !m_ruleSet.slottedPseudoElementRules().isEmpty() && !m_didInvalidateHostChildren;
+    if (shouldCheckForSlots && is<HTMLSlotElement>(element)) {
+        auto* containingShadowRoot = element.containingShadowRoot();
+        if (containingShadowRoot && containingShadowRoot->host()) {
+            for (auto& possiblySlotted : childrenOfType<Element>(*containingShadowRoot->host()))
+                possiblySlotted.invalidateStyle();
+        }
+        // No need to do this again.
+        m_didInvalidateHostChildren = true;
+    }
+
     switch (element.styleValidity()) {
     case Style::Validity::Valid: {
@@ -118 +130 @@
     case Style::Validity::SubtreeInvalid:
     case Style::Validity::SubtreeAndRenderersInvalid:
+        if (shouldCheckForSlots)
+            return CheckDescendants::Yes;
         return CheckDescendants::No;
     }
@@ -173 +187 @@
     ASSERT(!m_dirtiesAllStyle);
 
+    if (!m_ruleSet.hostPseudoClassRules().isEmpty() && shadowRoot.host())
+        shadowRoot.host()->invalidateStyle();
+
     for (auto& child : childrenOfType<Element>(shadowRoot)) {
         SelectorFilter filter;

trunk/Source/WebCore/css/StyleInvalidationAnalysis.h

@@ -59 +59 @@
     bool m_dirtiesAllStyle { false };
     bool m_hasShadowPseudoElementRulesInAuthorSheet { false };
+    bool m_didInvalidateHostChildren { false };
 };
 

trunk/Source/WebCore/dom/InlineStyleSheetOwner.cpp

@@ -214 +214 @@
 
     if (cacheKey && contents->isCacheable()) {
+        m_sheet->contents().addedToMemoryCache();
         inlineStyleSheetCache().add(*cacheKey, &m_sheet->contents());
 
         // Prevent pathological growth.
         const size_t maximumInlineStyleSheetCacheSize = 50;
-        if (inlineStyleSheetCache().size() > maximumInlineStyleSheetCacheSize)
+        if (inlineStyleSheetCache().size() > maximumInlineStyleSheetCacheSize) {
+            inlineStyleSheetCache().begin()->value->removedFromMemoryCache();
             inlineStyleSheetCache().remove(inlineStyleSheetCache().begin());
+        }
     }
 }

trunk/Source/WebCore/style/StyleScope.cpp

@@ -408 +408 @@
     }
 
+    // FIXME: Move this code somewhere else.
     if (requiresFullStyleRecalc) {
         if (m_shadowRoot) {
             for (auto& shadowChild : childrenOfType<Element>(*m_shadowRoot))
                 shadowChild.invalidateStyleForSubtree();
+            if (m_shadowRoot->host()) {
+                if (!resolver().ruleSets().authorStyle().hostPseudoClassRules().isEmpty())
+                    m_shadowRoot->host()->invalidateStyle();
+                if (!resolver().ruleSets().authorStyle().slottedPseudoElementRules().isEmpty()) {
+                    for (auto& shadowChild : childrenOfType<Element>(*m_shadowRoot->host()))
+                        shadowChild.invalidateStyle();
+                }
+            }
         } else
             m_document.scheduleForcedStyleRecalc();