<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[207077] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/207077">207077</a></dd>
<dt>Author</dt> <dd>antti@apple.com</dd>
<dt>Date</dt> <dd>2016-10-11 03:24:07 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorcpp">trunk/Source/WebCore/css/ElementRuleCollector.cpp</a></li>
<li><a href="#trunkSourceWebCorecssElementRuleCollectorh">trunk/Source/WebCore/css/ElementRuleCollector.h</a></li>
<li><a href="#trunkSourceWebCorecssRuleSetcpp">trunk/Source/WebCore/css/RuleSet.cpp</a></li>
<li><a href="#trunkSourceWebCorecssRuleSeth">trunk/Source/WebCore/css/RuleSet.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStyleScopecpp">trunk/Source/WebCore/style/StyleScope.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207076 => 207077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-11 10:22:44 UTC (rev 207076)
+++ trunk/Source/WebCore/ChangeLog 2016-10-11 10:24:07 UTC (rev 207077)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+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.
+
</ins><span class="cx"> 2016-10-11 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Update IDBVersionChangeEvent to stop using legacy [ConstructorTemplate=Event]
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.cpp (207076 => 207077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-10-11 10:22:44 UTC (rev 207076)
+++ trunk/Source/WebCore/css/ElementRuleCollector.cpp 2016-10-11 10:24:07 UTC (rev 207077)
</span><span class="lines">@@ -143,17 +143,9 @@
</span><span class="cx"> ASSERT(matchRequest.ruleSet);
</span><span class="cx"> 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.");
</span><span class="cx">
</span><del>-#if ENABLE(VIDEO_TRACK)
- if (m_element.isWebVTTElement())
- collectMatchingRulesForList(matchRequest.ruleSet->cuePseudoRules(), matchRequest, ruleRange);
-#endif
-
</del><span class="cx"> auto* shadowRoot = m_element.containingShadowRoot();
</span><del>- if (shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::UserAgent) {
- const AtomicString& pseudoId = m_element.shadowPseudoId();
- if (!pseudoId.isEmpty())
- collectMatchingRulesForList(matchRequest.ruleSet->shadowPseudoElementRules(pseudoId.impl()), matchRequest, ruleRange);
- }
</del><ins>+ if (shadowRoot && shadowRoot->mode() == ShadowRoot::Mode::UserAgent)
+ collectMatchingShadowPseudoElementRules(matchRequest, ruleRange);
</ins><span class="cx">
</span><span class="cx"> // We need to collect the rules for id, class, tag, and everything else into a buffer and
</span><span class="cx"> // then sort the buffer.
</span><span class="lines">@@ -226,9 +218,24 @@
</span><span class="cx"> if (m_element.shadowRoot())
</span><span class="cx"> matchHostPseudoClassRules(matchRequest, ruleRange);
</span><span class="cx">
</span><ins>+ if (m_element.isInShadowTree())
+ matchAuthorShadowPseudoElementRules(matchRequest, ruleRange);
+
</ins><span class="cx"> sortAndTransferMatchedRules();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> void ElementRuleCollector::matchHostPseudoClassRules(MatchRequest& matchRequest, StyleResolver::RuleRange& ruleRange)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_element.shadowRoot());
</span><span class="lines">@@ -284,6 +291,22 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> std::unique_ptr<RuleSet::RuleDataVector> ElementRuleCollector::collectSlottedPseudoElementRulesForSlot(bool includeEmptyRules)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(is<HTMLSlotElement>(m_element));
</span></span></pre></div>
<a id="trunkSourceWebCorecssElementRuleCollectorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/ElementRuleCollector.h (207076 => 207077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/ElementRuleCollector.h 2016-10-11 10:22:44 UTC (rev 207076)
+++ trunk/Source/WebCore/css/ElementRuleCollector.h 2016-10-11 10:24:07 UTC (rev 207077)
</span><span class="lines">@@ -76,8 +76,11 @@
</span><span class="cx"> void addElementStyleProperties(const StyleProperties*, bool isCacheable = true);
</span><span class="cx">
</span><span class="cx"> void matchUARules(RuleSet*);
</span><ins>+ void matchAuthorShadowPseudoElementRules(const MatchRequest&, StyleResolver::RuleRange&);
</ins><span class="cx"> void matchHostPseudoClassRules(MatchRequest&, StyleResolver::RuleRange&);
</span><span class="cx"> void matchSlottedPseudoElementRules(MatchRequest&, StyleResolver::RuleRange&);
</span><ins>+
+ void collectMatchingShadowPseudoElementRules(const MatchRequest&, StyleResolver::RuleRange&);
</ins><span class="cx"> std::unique_ptr<RuleSet::RuleDataVector> collectSlottedPseudoElementRulesForSlot(bool includeEmptyRules);
</span><span class="cx">
</span><span class="cx"> void collectMatchingRules(const MatchRequest&, StyleResolver::RuleRange&);
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.cpp (207076 => 207077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.cpp 2016-10-11 10:22:44 UTC (rev 207076)
+++ trunk/Source/WebCore/css/RuleSet.cpp 2016-10-11 10:24:07 UTC (rev 207077)
</span><span class="lines">@@ -394,18 +394,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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
-}
-
</del><span class="cx"> static inline void shrinkMapVectorsToFit(RuleSet::AtomRuleMap& map)
</span><span class="cx"> {
</span><span class="cx"> for (auto& vector : map.values())
</span></span></pre></div>
<a id="trunkSourceWebCorecssRuleSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/RuleSet.h (207076 => 207077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/RuleSet.h 2016-10-11 10:22:44 UTC (rev 207076)
+++ trunk/Source/WebCore/css/RuleSet.h 2016-10-11 10:24:07 UTC (rev 207077)
</span><span class="lines">@@ -192,7 +192,6 @@
</span><span class="cx"> unsigned ruleCount() const { return m_ruleCount; }
</span><span class="cx">
</span><span class="cx"> bool hasShadowPseudoElementRules() const;
</span><del>- void copyShadowPseudoElementRulesFrom(const RuleSet&);
</del><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void addChildRules(const Vector<RefPtr<StyleRuleBase>>&, const MediaQueryEvaluator& medium, StyleResolver*, bool hasDocumentSecurityOrigin, bool isInitiatingElementInUserAgentShadowTree, AddRuleFlags);
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (207076 => 207077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2016-10-11 10:22:44 UTC (rev 207076)
+++ trunk/Source/WebCore/dom/Document.cpp 2016-10-11 10:24:07 UTC (rev 207077)
</span><span class="lines">@@ -2144,15 +2144,8 @@
</span><span class="cx">
</span><span class="cx"> StyleResolver& Document::userAgentShadowTreeStyleResolver()
</span><span class="cx"> {
</span><del>- if (!m_userAgentShadowTreeStyleResolver) {
</del><ins>+ if (!m_userAgentShadowTreeStyleResolver)
</ins><span class="cx"> m_userAgentShadowTreeStyleResolver = std::make_unique<StyleResolver>(*this);
</span><del>-
- // 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);
- }
-
</del><span class="cx"> return *m_userAgentShadowTreeStyleResolver;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStyleScopecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StyleScope.cpp (207076 => 207077)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StyleScope.cpp 2016-10-11 10:22:44 UTC (rev 207076)
+++ trunk/Source/WebCore/style/StyleScope.cpp 2016-10-11 10:24:07 UTC (rev 207077)
</span><span class="lines">@@ -404,14 +404,6 @@
</span><span class="cx"> newStyleSheets.appendRange(activeStyleSheets.begin() + firstNewIndex, activeStyleSheets.end());
</span><span class="cx"> styleResolver.appendAuthorStyleSheets(newStyleSheets);
</span><span class="cx"> }
</span><del>-
- if (!m_shadowRoot) {
- auto& userAgentShadowTreeStyleResolver = m_document.userAgentShadowTreeStyleResolver();
- userAgentShadowTreeStyleResolver.ruleSets().resetAuthorStyle();
- auto& authorRuleSet = styleResolver.ruleSets().authorStyle();
- if (authorRuleSet.hasShadowPseudoElementRules())
- userAgentShadowTreeStyleResolver.ruleSets().authorStyle().copyShadowPseudoElementRulesFrom(authorRuleSet);
- }
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const Vector<RefPtr<CSSStyleSheet>> Scope::activeStyleSheetsForInspector() const
</span></span></pre>
</div>
</div>
</body>
</html>