Changeset 207077 in webkit

Timestamp:

Oct 11, 2016, 3:24:07 AM (8 years ago)

Author:

Antti Koivisto

Message:

Stop copying author shadow pseudo rules into shadow tree style resolver
​https://bugs.webkit.org/show_bug.cgi?id=163232

Reviewed by Darin Adler.

• css/ElementRuleCollector.cpp:

(WebCore::ElementRuleCollector::collectMatchingRules):
(WebCore::ElementRuleCollector::matchAuthorRules):
(WebCore::ElementRuleCollector::matchAuthorShadowPseudoElementRules):

If we are resolving a user agent shadow tree also look up pseudo element rules from the host scope author sheet.
This is needed to keep web exposed ::-webkit-foo pseudo elements working.

(WebCore::ElementRuleCollector::collectMatchingShadowPseudoElementRules):

Factor to a function.

• css/ElementRuleCollector.h:
• css/RuleSet.cpp:

(WebCore::RuleSet::copyShadowPseudoElementRulesFrom): Deleted.

• css/RuleSet.h:
• dom/Document.cpp:

(WebCore::Document::userAgentShadowTreeStyleResolver):

• style/StyleScope.cpp:

(WebCore::Style::Scope::updateStyleResolver):

No need to awkwardly copy these rules anymore.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/ElementRuleCollector.cpp (modified) (3 diffs)
• css/ElementRuleCollector.h (modified) (1 diff)
• css/RuleSet.cpp (modified) (1 diff)
• css/RuleSet.h (modified) (1 diff)
• dom/Document.cpp (modified) (1 diff)
• style/StyleScope.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-10-10  Antti Koivisto  <antti@apple.com>
+
+        Stop copying author shadow pseudo rules into shadow tree style resolver
+        https://bugs.webkit.org/show_bug.cgi?id=163232
+
+        Reviewed by Darin Adler.
+
+        * css/ElementRuleCollector.cpp:
+        (WebCore::ElementRuleCollector::collectMatchingRules):
+        (WebCore::ElementRuleCollector::matchAuthorRules):
+        (WebCore::ElementRuleCollector::matchAuthorShadowPseudoElementRules):
+
+            If we are resolving a user agent shadow tree also look up pseudo element rules from the host scope author sheet.
+            This is needed to keep web exposed ::-webkit-foo pseudo elements working.
+
+        (WebCore::ElementRuleCollector::collectMatchingShadowPseudoElementRules):
+
+            Factor to a function.
+
+        * css/ElementRuleCollector.h:
+        * css/RuleSet.cpp:
+        (WebCore::RuleSet::copyShadowPseudoElementRulesFrom): Deleted.
+        * css/RuleSet.h:
+        * dom/Document.cpp:
+        (WebCore::Document::userAgentShadowTreeStyleResolver):
+        * style/StyleScope.cpp:
+        (WebCore::Style::Scope::updateStyleResolver):
+
+            No need to awkwardly copy these rules anymore.
+
 2016-10-11  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/css/ElementRuleCollector.cpp

@@ -144 +144 @@
     ASSERT_WITH_MESSAGE(!(m_mode == SelectorChecker::Mode::CollectingRulesIgnoringVirtualPseudoElements && m_pseudoStyleRequest.pseudoId != NOPSEUDO), "When in StyleInvalidation or SharingRules, SelectorChecker does not try to match the pseudo ID. While ElementRuleCollector supports matching a particular pseudoId in this case, this would indicate a error at the call site since matching a particular element should be unnecessary.");
 
-#if ENABLE(VIDEO_TRACK)
-    if (m_element.isWebVTTElement())
-        collectMatchingRulesForList(matchRequest.ruleSet->cuePseudoRules(), matchRequest, ruleRange);
-#endif
-
     auto* shadowRoot = m_element.containingShadowRoot();
-    if (shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::UserAgent) {
-        const AtomicString& pseudoId = m_element.shadowPseudoId();
-        if (!pseudoId.isEmpty())
-            collectMatchingRulesForList(matchRequest.ruleSet->shadowPseudoElementRules(pseudoId.impl()), matchRequest, ruleRange);
-    }
+    if (shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::UserAgent)
+        collectMatchingShadowPseudoElementRules(matchRequest, ruleRange);
 
     // We need to collect the rules for id, class, tag, and everything else into a buffer and
@@ -227 +219 @@
         matchHostPseudoClassRules(matchRequest, ruleRange);
 
+    if (m_element.isInShadowTree())
+        matchAuthorShadowPseudoElementRules(matchRequest, ruleRange);
+
     sortAndTransferMatchedRules();
+}
+
+void ElementRuleCollector::matchAuthorShadowPseudoElementRules(const MatchRequest& matchRequest, StyleResolver::RuleRange& ruleRange)
+{
+    ASSERT(m_element.isInShadowTree());
+    auto& shadowRoot = *m_element.containingShadowRoot();
+    if (shadowRoot.mode() != ShadowRoot::Mode::UserAgent)
+        return;
+    // Look up shadow pseudo elements also from the host scope author style as they are web-exposed.
+    auto& hostAuthorRules = Style::Scope::forNode(*shadowRoot.host()).resolver().ruleSets().authorStyle();
+    MatchRequest hostAuthorRequest { &hostAuthorRules, matchRequest.includeEmptyRules };
+    collectMatchingShadowPseudoElementRules(hostAuthorRequest, ruleRange);
 }
 
@@ -283 +290 @@
         m_keepAliveSlottedPseudoElementRules.append(WTFMove(slottedPseudoElementRules));
     }
+}
+
+void ElementRuleCollector::collectMatchingShadowPseudoElementRules(const MatchRequest& matchRequest, StyleResolver::RuleRange& ruleRange)
+{
+    ASSERT(matchRequest.ruleSet);
+    ASSERT(m_element.containingShadowRoot()->mode() == ShadowRoot::Mode::UserAgent);
+
+    auto& rules = *matchRequest.ruleSet;
+#if ENABLE(VIDEO_TRACK)
+    // FXIME: WebVTT should not be done by styling UA shadow trees like this.
+    if (m_element.isWebVTTElement())
+        collectMatchingRulesForList(rules.cuePseudoRules(), matchRequest, ruleRange);
+#endif
+    auto& pseudoId = m_element.shadowPseudoId();
+    if (!pseudoId.isEmpty())
+        collectMatchingRulesForList(rules.shadowPseudoElementRules(pseudoId.impl()), matchRequest, ruleRange);
 }
 

trunk/Source/WebCore/css/ElementRuleCollector.h

@@ -77 +77 @@
 
     void matchUARules(RuleSet*);
+    void matchAuthorShadowPseudoElementRules(const MatchRequest&, StyleResolver::RuleRange&);
     void matchHostPseudoClassRules(MatchRequest&, StyleResolver::RuleRange&);
     void matchSlottedPseudoElementRules(MatchRequest&, StyleResolver::RuleRange&);
+
+    void collectMatchingShadowPseudoElementRules(const MatchRequest&, StyleResolver::RuleRange&);
     std::unique_ptr<RuleSet::RuleDataVector> collectSlottedPseudoElementRulesForSlot(bool includeEmptyRules);
 

trunk/Source/WebCore/css/RuleSet.cpp

@@ -395 +395 @@
 }
 
-void RuleSet::copyShadowPseudoElementRulesFrom(const RuleSet& other)
-{
-    for (auto& keyValuePair : other.m_shadowPseudoElementRules)
-        m_shadowPseudoElementRules.add(keyValuePair.key, std::make_unique<RuleDataVector>(*keyValuePair.value));
-
-#if ENABLE(VIDEO_TRACK)
-    // FIXME: We probably shouldn't treat WebVTT as author stylable user agent shadow tree.
-    for (auto& cue : other.m_cuePseudoRules)
-        m_cuePseudoRules.append(cue);
-#endif
-}
-
 static inline void shrinkMapVectorsToFit(RuleSet::AtomRuleMap& map)
 {

trunk/Source/WebCore/css/RuleSet.h

@@ -193 +193 @@
 
     bool hasShadowPseudoElementRules() const;
-    void copyShadowPseudoElementRulesFrom(const RuleSet&);
 
 private:

trunk/Source/WebCore/dom/Document.cpp

@@ -2145 +2145 @@
 StyleResolver& Document::userAgentShadowTreeStyleResolver()
 {
-    if (!m_userAgentShadowTreeStyleResolver) {
+    if (!m_userAgentShadowTreeStyleResolver)
         m_userAgentShadowTreeStyleResolver = std::make_unique<StyleResolver>(*this);
-
-        // FIXME: Filter out shadow pseudo elements we don't want to expose to authors.
-        auto& documentAuthorStyle = styleScope().resolver().ruleSets().authorStyle();
-        if (documentAuthorStyle.hasShadowPseudoElementRules())
-            m_userAgentShadowTreeStyleResolver->ruleSets().authorStyle().copyShadowPseudoElementRulesFrom(documentAuthorStyle);
-    }
-
     return *m_userAgentShadowTreeStyleResolver;
 }

trunk/Source/WebCore/style/StyleScope.cpp

@@ -405 +405 @@
         styleResolver.appendAuthorStyleSheets(newStyleSheets);
     }
-
-    if (!m_shadowRoot) {
-        auto& userAgentShadowTreeStyleResolver = m_document.userAgentShadowTreeStyleResolver();
-        userAgentShadowTreeStyleResolver.ruleSets().resetAuthorStyle();
-        auto& authorRuleSet = styleResolver.ruleSets().authorStyle();
-        if (authorRuleSet.hasShadowPseudoElementRules())
-            userAgentShadowTreeStyleResolver.ruleSets().authorStyle().copyShadowPseudoElementRulesFrom(authorRuleSet);
-    }
 }