Add a first pass of a class descendant invalidator, and a containing RuleSetAnalyzer

Source/core/css/RuleFeature.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 17 matching lines @@
 
 #include "config.h"
 #include "core/css/RuleFeature.h"
 
 #include "HTMLNames.h"
 #include "core/css/CSSSelector.h"
 #include "core/css/CSSSelectorList.h"
 
 namespace WebCore {
 
-void RuleFeatureSet::collectFeaturesFromSelector(const CSSSelector* selector)
+void RuleFeatureSet::collectFeaturesFromSelector(const CSSSelector* selector, HashSet<AtomicString>* classesInRulesArg)
 {
     if (selector->m_match == CSSSelector::Id)
         idsInRules.add(selector->value());
-    else if (selector->m_match == CSSSelector::Class)
+    else if (selector->m_match == CSSSelector::Class) {
         classesInRules.add(selector->value());
-    else if (selector->isAttributeSelector())
+        if (classesInRulesArg)
+            classesInRulesArg->add(selector->value());
+    } else if (selector->isAttributeSelector())
         attrsInRules.add(selector->attribute().localName());
     switch (selector->pseudoType()) {
     case CSSSelector::PseudoFirstLine:
         m_usesFirstLineRules = true;
         break;
         break;
     case CSSSelector::PseudoHost:
-        collectFeaturesFromSelectorList(selector->selectorList());
+        collectFeaturesFromSelectorList(selector->selectorList(), classesInRulesArg);
         break;
     default:
         break;
     }
 }
 
-void RuleFeatureSet::collectFeaturesFromSelectorList(const CSSSelectorList* selectorList)
+void RuleFeatureSet::collectFeaturesFromSelectorList(const CSSSelectorList* selectorList, HashSet<AtomicString>* classesInRulesArg)
 {
     if (!selectorList)
         return;
 
     for (const CSSSelector* selector = selectorList->first(); selector; selector = CSSSelectorList::next(selector)) {
         for (const CSSSelector* subSelector = selector; subSelector; subSelector = subSelector->tagHistory())
-            collectFeaturesFromSelector(subSelector);
+            collectFeaturesFromSelector(subSelector, classesInRulesArg);
     }
 }
 
 void RuleFeatureSet::add(const RuleFeatureSet& other)
 {
+    if (RuleSetAnalyzer* otherAnalyzer = other.getRuleSetAnalyzer())
+        ensureRuleSetAnalyzer()->combine(*otherAnalyzer);
+
     HashSet<AtomicString>::const_iterator end = other.idsInRules.end();
     for (HashSet<AtomicString>::const_iterator it = other.idsInRules.begin(); it != end; ++it)
         idsInRules.add(*it);
     end = other.classesInRules.end();
     for (HashSet<AtomicString>::const_iterator it = other.classesInRules.begin(); it != end; ++it)
         classesInRules.add(*it);
     end = other.attrsInRules.end();
     for (HashSet<AtomicString>::const_iterator it = other.attrsInRules.begin(); it != end; ++it)
         attrsInRules.add(*it);
     siblingRules.append(other.siblingRules);
     uncommonAttributeRules.append(other.uncommonAttributeRules);
     m_usesFirstLineRules = m_usesFirstLineRules || other.m_usesFirstLineRules;
     m_maxDirectAdjacentSelectors = std::max(m_maxDirectAdjacentSelectors, other.maxDirectAdjacentSelectors());
 }
 
 void RuleFeatureSet::clear()
 {
     idsInRules.clear();
     classesInRules.clear();
     attrsInRules.clear();
     siblingRules.clear();
     uncommonAttributeRules.clear();
     m_usesFirstLineRules = false;
     m_maxDirectAdjacentSelectors = 0;
 }
 
+RuleSetAnalyzer* RuleFeatureSet::getRuleSetAnalyzer() const
+{
+    return ruleSetAnalyzer.get();
+}
+
+RuleSetAnalyzer* RuleFeatureSet::ensureRuleSetAnalyzer()
+{
+    if (!ruleSetAnalyzer)
+        ruleSetAnalyzer = RuleSetAnalyzer::create();
+    return ruleSetAnalyzer.get();
+}
+
 } // namespace WebCore