Move StyleResolver code out of ScopedStyleResolver.

sky/engine/core/css/RuleSet.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 25 matching lines @@
 #include "sky/engine/core/css/SelectorChecker.h"
 #include "sky/engine/core/css/StyleRuleKeyframes.h"
 #include "sky/engine/core/css/StyleSheetContents.h"
 #include "sky/engine/platform/TraceEvent.h"
 #include "sky/engine/wtf/TerminatedArrayBuilder.h"
 
 namespace blink {
 
 // -----------------------------------------------------------------
 
-RuleData::RuleData(StyleRule* rule, unsigned selectorIndex, unsigned position, AddRuleFlags addRuleFlags)
+RuleData::RuleData(StyleRule* rule, unsigned selectorIndex, unsigned position)
     : m_rule(rule)
     , m_selectorIndex(selectorIndex)
     , m_isLastInArray(false)
     , m_position(position)
 {
     ASSERT(m_position == position);
     ASSERT(m_selectorIndex == selectorIndex);
 }
 
 void RuleSet::addToRuleSet(const AtomicString& key, PendingRuleMap& map, const RuleData& ruleData)
@@ skipping 62 matching lines @@
     }
 
     if (!tagName.isEmpty()) {
         addToRuleSet(tagName, ensurePendingRules()->tagRules, ruleData);
         return true;
     }
 
     return false;
 }
 
-void RuleSet::addRule(StyleRule* rule, unsigned selectorIndex, AddRuleFlags addRuleFlags)
+void RuleSet::addRule(StyleRule* rule, unsigned selectorIndex)
 {
-    RuleData ruleData(rule, selectorIndex, m_ruleCount++, addRuleFlags);
+    RuleData ruleData(rule, selectorIndex, m_ruleCount++);
     m_features.collectFeaturesFromSelector(ruleData.selector());
 
     if (!findBestRuleSetAndAdd(ruleData.selector(), ruleData)) {
         // If we didn't find a specialized map to stick it in, file under universal rules.
         m_universalRules.append(ruleData);
     }
 }
 
 void RuleSet::addFontFaceRule(StyleRuleFontFace* rule)
 {
     ensurePendingRules(); // So that m_fontFaceRules.shrinkToFit() gets called.
     m_fontFaceRules.append(rule);
 }
 
 void RuleSet::addKeyframesRule(StyleRuleKeyframes* rule)
 {
     ensurePendingRules(); // So that m_keyframesRules.shrinkToFit() gets called.
     m_keyframesRules.append(rule);
 }
 
-void RuleSet::addChildRules(const Vector<RefPtr<StyleRuleBase> >& rules, AddRuleFlags addRuleFlags)
+void RuleSet::addChildRules(const Vector<RefPtr<StyleRuleBase> >& rules)
 {
     for (unsigned i = 0; i < rules.size(); ++i) {
         StyleRuleBase* rule = rules[i].get();
 
         if (rule->isStyleRule()) {
             StyleRule* styleRule = toStyleRule(rule);
 
             const CSSSelectorList& selectorList = styleRule->selectorList();
             for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorIndex = selectorList.indexOfNextSelectorAfter(selectorIndex))
-                addRule(styleRule, selectorIndex, addRuleFlags);
+                addRule(styleRule, selectorIndex);
         } else if (rule->isFontFaceRule()) {
             addFontFaceRule(toStyleRuleFontFace(rule));
         } else if (rule->isKeyframesRule()) {
             addKeyframesRule(toStyleRuleKeyframes(rule));
         } else if (rule->isSupportsRule() && toStyleRuleSupports(rule)->conditionIsSupported()) {
-            addChildRules(toStyleRuleSupports(rule)->childRules(), addRuleFlags);
+            addChildRules(toStyleRuleSupports(rule)->childRules());
         }
     }
 }
 
-void RuleSet::addRulesFromSheet(StyleSheetContents* sheet, AddRuleFlags addRuleFlags)
+void RuleSet::addRulesFromSheet(StyleSheetContents* sheet)
 {
     TRACE_EVENT0("blink", "RuleSet::addRulesFromSheet");
     ASSERT(sheet);
-    addRuleFlags = static_cast<AddRuleFlags>(addRuleFlags | RuleCanUseFastCheckSelector);
-    addChildRules(sheet->childRules(), addRuleFlags);
+    addChildRules(sheet->childRules());
 }
 
-void RuleSet::addStyleRule(StyleRule* rule, AddRuleFlags addRuleFlags)
+void RuleSet::addStyleRule(StyleRule* rule)
 {
     for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorIndex = rule->selectorList().indexOfNextSelectorAfter(selectorIndex))
-        addRule(rule, selectorIndex, addRuleFlags);
+        addRule(rule, selectorIndex);
 }
 
 void RuleSet::compactPendingRules(PendingRuleMap& pendingMap, CompactRuleMap& compactMap)
 {
     PendingRuleMap::iterator end = pendingMap.end();
     for (PendingRuleMap::iterator it = pendingMap.begin(); it != end; ++it) {
         OwnPtr<LinkedStack<RuleData> > pendingRules = it->value.release();
         CompactRuleMap::ValueType* compactRules = compactMap.add(it->key, nullptr).storedValue;
 
         TerminatedArrayBuilder<RuleData> builder(compactRules->value.release());
@@ skipping 22 matching lines @@
 
 #ifndef NDEBUG
 void RuleSet::show()
 {
     for (Vector<RuleData>::const_iterator it = m_allRules.begin(); it != m_allRules.end(); ++it)
         it->selector().show();
 }
 #endif
 
 } // namespace blink