Changeset 202227 in webkit

Timestamp:

Jun 20, 2016, 1:52:10 AM (9 years ago)

Author:

Antti Koivisto

Message:

Updating class name of a shadow host does not update the style applied by :host()
​https://bugs.webkit.org/show_bug.cgi?id=158900
<rdar://problem/26883707>

Reviewed by Simon Fraser.

Source/WebCore:

Test: fast/shadow-dom/shadow-host-style-update.html

Teach style invalidation optimization code about :host.

• style/AttributeChangeInvalidation.cpp:

(WebCore::Style::mayBeAffectedByHostStyle):
(WebCore::Style::AttributeChangeInvalidation::invalidateStyle):

• style/ClassChangeInvalidation.cpp:

(WebCore::Style::computeClassChange):
(WebCore::Style::mayBeAffectedByHostStyle):
(WebCore::Style::ClassChangeInvalidation::invalidateStyle):

• style/IdChangeInvalidation.cpp:

(WebCore::Style::mayBeAffectedByHostStyle):
(WebCore::Style::IdChangeInvalidation::invalidateStyle):

LayoutTests:

• fast/shadow-dom/shadow-host-style-update-expected.html: Added.
• fast/shadow-dom/shadow-host-style-update.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/shadow-dom/shadow-host-style-update-expected.html (added)
• LayoutTests/fast/shadow-dom/shadow-host-style-update.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/style/AttributeChangeInvalidation.cpp (modified) (3 diffs)
• Source/WebCore/style/ClassChangeInvalidation.cpp (modified) (4 diffs)
• Source/WebCore/style/IdChangeInvalidation.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-19  Antti Koivisto  <antti@apple.com>
+
+        Updating class name of a shadow host does not update the style applied by :host()
+        https://bugs.webkit.org/show_bug.cgi?id=158900
+        <rdar://problem/26883707>
+
+        Reviewed by Simon Fraser.
+
+        * fast/shadow-dom/shadow-host-style-update-expected.html: Added.
+        * fast/shadow-dom/shadow-host-style-update.html: Added.
+
 2016-06-19  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-19  Antti Koivisto  <antti@apple.com>
+
+        Updating class name of a shadow host does not update the style applied by :host()
+        https://bugs.webkit.org/show_bug.cgi?id=158900
+        <rdar://problem/26883707>
+
+        Reviewed by Simon Fraser.
+
+        Test: fast/shadow-dom/shadow-host-style-update.html
+
+        Teach style invalidation optimization code about :host.
+
+        * style/AttributeChangeInvalidation.cpp:
+        (WebCore::Style::mayBeAffectedByHostStyle):
+        (WebCore::Style::AttributeChangeInvalidation::invalidateStyle):
+        * style/ClassChangeInvalidation.cpp:
+        (WebCore::Style::computeClassChange):
+        (WebCore::Style::mayBeAffectedByHostStyle):
+        (WebCore::Style::ClassChangeInvalidation::invalidateStyle):
+        * style/IdChangeInvalidation.cpp:
+        (WebCore::Style::mayBeAffectedByHostStyle):
+        (WebCore::Style::IdChangeInvalidation::invalidateStyle):
+
 2016-06-19  Gavin & Ellie Barraclough  <barraclough@apple.com>
 

trunk/Source/WebCore/style/AttributeChangeInvalidation.cpp

@@ -29 +29 @@
 #include "DocumentRuleSets.h"
 #include "ElementIterator.h"
+#include "ShadowRoot.h"
 #include "StyleInvalidationAnalysis.h"
 #include "StyleResolver.h"
@@ -34 +35 @@
 namespace WebCore {
 namespace Style {
+
+static bool mayBeAffectedByHostStyle(ShadowRoot& shadowRoot, bool isHTML, const QualifiedName& attributeName)
+{
+    auto& shadowRuleSets = shadowRoot.styleResolver().ruleSets();
+    if (shadowRuleSets.authorStyle()->hostPseudoClassRules().isEmpty())
+        return false;
+
+    auto& nameSet = isHTML ? shadowRuleSets.features().attributeCanonicalLocalNamesInRules : shadowRuleSets.features().attributeLocalNamesInRules;
+    return nameSet.contains(attributeName.localName().impl());
+}
 
 void AttributeChangeInvalidation::invalidateStyle(const QualifiedName& attributeName, const AtomicString& oldValue, const AtomicString& newValue)
@@ -44 +55 @@
 
     auto& nameSet = isHTML ? ruleSets.features().attributeCanonicalLocalNamesInRules : ruleSets.features().attributeLocalNamesInRules;
-    bool shouldInvalidate = nameSet.contains(attributeName.localName().impl());
-    if (!shouldInvalidate)
+    bool mayAffectStyle = nameSet.contains(attributeName.localName().impl());
+
+    auto* shadowRoot = m_element.shadowRoot();
+    if (!mayAffectStyle && shadowRoot && mayBeAffectedByHostStyle(*shadowRoot, isHTML, attributeName))
+        mayAffectStyle = true;
+
+    if (!mayAffectStyle)
         return;
 

trunk/Source/WebCore/style/ClassChangeInvalidation.cpp

@@ -29 +29 @@
 #include "DocumentRuleSets.h"
 #include "ElementChildIterator.h"
+#include "ShadowRoot.h"
 #include "SpaceSplitString.h"
 #include "StyleInvalidationAnalysis.h"
@@ -85 +86 @@
 }
 
+static bool mayBeAffectedByHostStyle(ShadowRoot& shadowRoot, AtomicStringImpl* changedClass)
+{
+    auto& shadowRuleSets = shadowRoot.styleResolver().ruleSets();
+    if (shadowRuleSets.authorStyle()->hostPseudoClassRules().isEmpty())
+        return false;
+    return shadowRuleSets.features().classesInRules.contains(changedClass);
+}
+
 void ClassChangeInvalidation::invalidateStyle(const SpaceSplitString& oldClasses, const SpaceSplitString& newClasses)
 {
@@ -90 +99 @@
 
     auto& ruleSets = m_element.styleResolver().ruleSets();
+    auto* shadowRoot = m_element.shadowRoot();
 
     ClassChangeVector changedClassesAffectingStyle;
     for (auto* changedClass : changedClasses) {
-        if (ruleSets.features().classesInRules.contains(changedClass))
+        bool mayAffectStyle = ruleSets.features().classesInRules.contains(changedClass);
+
+        if (!mayAffectStyle && shadowRoot && mayBeAffectedByHostStyle(*shadowRoot, changedClass))
+            mayAffectStyle = true;
+
+        if (mayAffectStyle)
             changedClassesAffectingStyle.append(changedClass);
     };
@@ -100 +115 @@
         return;
 
-    if (m_element.shadowRoot() && ruleSets.authorStyle()->hasShadowPseudoElementRules()) {
+    if (shadowRoot && ruleSets.authorStyle()->hasShadowPseudoElementRules()) {
         m_element.setNeedsStyleRecalc(FullStyleChange);
         return;

trunk/Source/WebCore/style/IdChangeInvalidation.cpp

@@ -29 +29 @@
 #include "DocumentRuleSets.h"
 #include "ElementChildIterator.h"
+#include "ShadowRoot.h"
 #include "StyleResolver.h"
 
 namespace WebCore {
 namespace Style {
+
+static bool mayBeAffectedByHostStyle(ShadowRoot& shadowRoot, const AtomicString& changedId)
+{
+    auto& shadowRuleSets = shadowRoot.styleResolver().ruleSets();
+    if (shadowRuleSets.authorStyle()->hostPseudoClassRules().isEmpty())
+        return false;
+
+    return shadowRuleSets.features().idsInRules.contains(changedId.impl());
+}
 
 void IdChangeInvalidation::invalidateStyle(const AtomicString& changedId)
@@ -42 +52 @@
 
     bool mayAffectStyle = ruleSets.features().idsInRules.contains(changedId.impl());
+
+    auto* shadowRoot = m_element.shadowRoot();
+    if (!mayAffectStyle && shadowRoot && mayBeAffectedByHostStyle(*shadowRoot, changedId))
+        mayAffectStyle = true;
+
     if (!mayAffectStyle)
         return;