Chromium Code Reviews| Index: third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp |
| diff --git a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp |
| index f8b451a9ae24d3de8a09fec0994cd2134cf69783..1a4eee815bf7f048d02a4266fb79a2e4a4ee8944 100644 |
| --- a/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp |
| +++ b/third_party/WebKit/Source/core/css/resolver/StyleResolver.cpp |
| @@ -72,6 +72,7 @@ |
| #include "core/css/resolver/StyleAdjuster.h" |
| #include "core/css/resolver/StyleResolverState.h" |
| #include "core/css/resolver/StyleResolverStats.h" |
| +#include "core/css/resolver/StyleRuleUsageTracker.h" |
| #include "core/dom/CSSSelectorWatch.h" |
| #include "core/dom/FirstLetterPseudoElement.h" |
| #include "core/dom/NodeComputedStyle.h" |
| @@ -214,6 +215,10 @@ void StyleResolver::initWatchedSelectorRules() { |
| RuleHasNoSpecialState); |
| } |
| +void StyleResolver::setRuleUsageTracker(StyleRuleUsageTracker* tracker) { |
| + m_tracker = tracker; |
| +} |
| + |
| void StyleResolver::lazyAppendAuthorStyleSheets( |
| unsigned firstNew, |
| const HeapVector<Member<CSSStyleSheet>>& styleSheets) { |
| @@ -846,6 +851,8 @@ PassRefPtr<ComputedStyle> StyleResolver::styleForElement( |
| } |
| } |
| + addMatchedRulesToTracker(collector); |
|
pfeldman
2016/10/31 21:03:35
I'd pull the check into the call site:
if (m_trac
|
| + |
| if (element->computedStyle() && |
| element->computedStyle()->textAutosizingMultiplier() != |
| state.style()->textAutosizingMultiplier()) { |
| @@ -1020,6 +1027,8 @@ bool StyleResolver::pseudoStyleForElementInternal( |
| matchAuthorRules(*state.element(), collector); |
| collector.finishAddingAuthorRulesForTreeScope(); |
| + addMatchedRulesToTracker(collector); |
| + |
| if (!collector.matchedResult().hasMatchedProperties()) |
| return false; |
| @@ -1142,6 +1151,15 @@ void StyleResolver::updateFont(StyleResolverState& state) { |
| state.setConversionZoom(state.style()->effectiveZoom()); |
| } |
| +void StyleResolver::addMatchedRulesToTracker( |
| + const ElementRuleCollector& collector) { |
| + if (!m_tracker) |
| + return; |
| + |
| + for (auto matchedRule : collector.matchedRulesList()) |
| + m_tracker->markRuleAsUsed(matchedRule.ruleData()->rule()); |
| +} |
| + |
| StyleRuleList* StyleResolver::styleRulesForElement(Element* element, |
| unsigned rulesToInclude) { |
| ASSERT(element); |
| @@ -1163,6 +1181,8 @@ CSSRuleList* StyleResolver::pseudoCSSRulesForElement(Element* element, |
| state.style()); |
| collector.setMode(SelectorChecker::CollectingCSSRules); |
| collectPseudoRulesForElement(*element, collector, pseudoId, rulesToInclude); |
| + |
| + addMatchedRulesToTracker(collector); |
| return collector.matchedCSSRuleList(); |
| } |
| @@ -1851,6 +1871,8 @@ void StyleResolver::applyCallbackSelectors(StyleResolverState& state) { |
| collector.collectMatchingRules(matchRequest); |
| collector.sortAndTransferMatchedRules(); |
| + addMatchedRulesToTracker(collector); |
| + |
| StyleRuleList* rules = collector.matchedStyleRuleList(); |
| if (!rules) |
| return; |
| @@ -1922,6 +1944,7 @@ DEFINE_TRACE(StyleResolver) { |
| visitor->trace(m_styleSharingLists); |
| visitor->trace(m_pendingStyleSheets); |
| visitor->trace(m_document); |
| + visitor->trace(m_tracker); |
| } |
| } // namespace blink |