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

Unified Diff: Source/core/css/RuleFeature.cpp

Issue 155283002: Count consecutive direct adjacent selectors. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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
« no previous file with comments | « LayoutTests/fast/css/recalc-direct-adjacent-001-expected.txt ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/css/RuleFeature.cpp
diff --git a/Source/core/css/RuleFeature.cpp b/Source/core/css/RuleFeature.cpp
index 7cb58c1d79632a91cfb32781f394f2c01c444839..8e8f7a44ed2a77ada24fc1e01c7b6fb0c1852543 100644
--- a/Source/core/css/RuleFeature.cpp
+++ b/Source/core/css/RuleFeature.cpp
@@ -171,6 +171,8 @@ void RuleFeatureSet::collectFeaturesFromSelector(const CSSSelector& selector)
void RuleFeatureSet::collectFeaturesFromSelector(const CSSSelector& selector, RuleFeatureSet::FeatureMetadata& metadata)
{
+ unsigned maxDirectAdjacentSelectors = 0;
+
for (const CSSSelector* current = &selector; current; current = current->tagHistory()) {
if (current->m_match == CSSSelector::Id)
metadata.idsInRules.add(current->value());
@@ -181,13 +183,20 @@ void RuleFeatureSet::collectFeaturesFromSelector(const CSSSelector& selector, Ru
if (current->pseudoType() == CSSSelector::PseudoFirstLine)
metadata.usesFirstLineRules = true;
- if (current->isDirectAdjacentSelector())
- metadata.maxDirectAdjacentSelectors++;
+ if (current->isDirectAdjacentSelector()) {
+ maxDirectAdjacentSelectors++;
+ } else if (maxDirectAdjacentSelectors) {
+ if (maxDirectAdjacentSelectors > metadata.maxDirectAdjacentSelectors)
+ metadata.maxDirectAdjacentSelectors = maxDirectAdjacentSelectors;
+ maxDirectAdjacentSelectors = 0;
+ }
if (current->isSiblingSelector())
metadata.foundSiblingSelector = true;
collectFeaturesFromSelectorList(current->selectorList(), metadata);
}
+
+ ASSERT(!maxDirectAdjacentSelectors);
}
void RuleFeatureSet::collectFeaturesFromSelectorList(const CSSSelectorList* selectorList, RuleFeatureSet::FeatureMetadata& metadata)
« no previous file with comments | « LayoutTests/fast/css/recalc-direct-adjacent-001-expected.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698