Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Unified Diff: third_party/WebKit/Source/core/css/RuleSet.cpp

Issue 1565263003: Implement CSS parser part for ::slotted pseudo element (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase, fix layout test. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/core/css/RuleSet.cpp
diff --git a/third_party/WebKit/Source/core/css/RuleSet.cpp b/third_party/WebKit/Source/core/css/RuleSet.cpp
index db68b88cfd0aa6e67f6b0ecee2cc744aa9ef00e1..bc735aa64c17e9154a58c9de90ac2073e92fa9d2 100644
--- a/third_party/WebKit/Source/core/css/RuleSet.cpp
+++ b/third_party/WebKit/Source/core/css/RuleSet.cpp
@@ -260,8 +260,10 @@ void RuleSet::addChildRules(const WillBeHeapVector<RefPtrWillBeMember<StyleRuleB
for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorIndex = selectorList.indexOfNextSelectorAfter(selectorIndex)) {
if (selectorList.selectorUsesDeepCombinatorOrShadowPseudo(selectorIndex)) {
m_deepCombinatorOrShadowPseudoRules.append(MinimalRuleData(styleRule, selectorIndex, addRuleFlags));
- } else if (selectorList.selectorHasShadowDistributed(selectorIndex)) {
+ } else if (selectorList.selectorHasContentPseudo(selectorIndex)) {
m_shadowDistributedRules.append(MinimalRuleData(styleRule, selectorIndex, addRuleFlags));
+ } else if (selectorList.selectorHasSlottedPseudo(selectorIndex)) {
+ m_shadowSlottedRules.append(MinimalRuleData(styleRule, selectorIndex, addRuleFlags));
} else {
addRule(styleRule, selectorIndex, addRuleFlags);
}
@@ -342,6 +344,7 @@ void RuleSet::compactRules()
m_keyframesRules.shrinkToFit();
m_deepCombinatorOrShadowPseudoRules.shrinkToFit();
m_shadowDistributedRules.shrinkToFit();
+ m_shadowSlottedRules.shrinkToFit();
}
DEFINE_TRACE(MinimalRuleData)
@@ -383,6 +386,7 @@ DEFINE_TRACE(RuleSet)
visitor->trace(m_keyframesRules);
visitor->trace(m_deepCombinatorOrShadowPseudoRules);
visitor->trace(m_shadowDistributedRules);
+ visitor->trace(m_shadowSlottedRules);
visitor->trace(m_viewportDependentMediaQueryResults);
visitor->trace(m_deviceDependentMediaQueryResults);
visitor->trace(m_pendingRules);
« no previous file with comments | « third_party/WebKit/Source/core/css/RuleSet.h ('k') | third_party/WebKit/Source/core/css/SelectorChecker.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698