Move StyleResolver code out of ScopedStyleResolver.

sky/engine/core/css/RuleSet.h

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
@@ skipping 16 matching lines @@
 #include "sky/engine/core/css/StyleRule.h"
 #include "sky/engine/core/css/StyleRuleKeyframes.h"
 #include "sky/engine/core/css/resolver/MediaQueryResult.h"
 #include "sky/engine/wtf/Forward.h"
 #include "sky/engine/wtf/HashMap.h"
 #include "sky/engine/wtf/LinkedStack.h"
 #include "sky/engine/wtf/TerminatedArray.h"
 
 namespace blink {
 
-enum AddRuleFlags {
-    RuleHasNoSpecialState         = 0,
-    RuleCanUseFastCheckSelector   = 1,
-};
-
 class CSSSelector;
 class StyleSheetContents;
 
 class RuleData {
     ALLOW_ONLY_INLINE_ALLOCATION();
 public:
-    RuleData(StyleRule*, unsigned selectorIndex, unsigned position, AddRuleFlags);
+    RuleData(StyleRule*, unsigned selectorIndex, unsigned position);
 
     unsigned position() const { return m_position; }
     StyleRule* rule() const { return m_rule; }
     const CSSSelector& selector() const { return m_rule->selectorList().selectorAt(m_selectorIndex); }
     unsigned selectorIndex() const { return m_selectorIndex; }
 
     bool isLastInArray() const { return m_isLastInArray; }
     void setLastInArray(bool flag) { m_isLastInArray = flag; }
 
 private:
@@ skipping 11 matching lines @@
 };
 
 COMPILE_ASSERT(sizeof(RuleData) == sizeof(SameSizeAsRuleData), RuleData_should_stay_small);
 
 class RuleSet {
     WTF_MAKE_NONCOPYABLE(RuleSet);
     WTF_MAKE_FAST_ALLOCATED;
 public:
     static PassOwnPtr<RuleSet> create() { return adoptPtr(new RuleSet); }
 
-    void addRulesFromSheet(StyleSheetContents*, AddRuleFlags = RuleHasNoSpecialState);
-    void addStyleRule(StyleRule*, AddRuleFlags);
-    void addRule(StyleRule*, unsigned selectorIndex, AddRuleFlags);
+    void addRulesFromSheet(StyleSheetContents*);
+    void addStyleRule(StyleRule*);
+    void addRule(StyleRule*, unsigned selectorIndex);
 
     const RuleFeatureSet& features() const { return m_features; }
 
     const TerminatedArray<RuleData>* idRules(const AtomicString& key) const { ASSERT(!m_pendingRules); return m_idRules.get(key); }
     const TerminatedArray<RuleData>* classRules(const AtomicString& key) const { ASSERT(!m_pendingRules); return m_classRules.get(key); }
     const TerminatedArray<RuleData>* tagRules(const AtomicString& key) const { ASSERT(!m_pendingRules); return m_tagRules.get(key); }
     const TerminatedArray<RuleData>* shadowPseudoElementRules(const AtomicString& key) const { ASSERT(!m_pendingRules); return m_shadowPseudoElementRules.get(key); }
     const Vector<RuleData>* universalRules() const { ASSERT(!m_pendingRules); return &m_universalRules; }
     const Vector<RawPtr<StyleRuleFontFace> >& fontFaceRules() const { return m_fontFaceRules; }
     const Vector<RawPtr<StyleRuleKeyframes> >& keyframesRules() const { return m_keyframesRules; }
@@ skipping 16 matching lines @@
 
     RuleSet()
         : m_ruleCount(0)
     {
     }
 
     void addToRuleSet(const AtomicString& key, PendingRuleMap&, const RuleData&);
     void addFontFaceRule(StyleRuleFontFace*);
     void addKeyframesRule(StyleRuleKeyframes*);
 
-    void addChildRules(const Vector<RefPtr<StyleRuleBase> >&, AddRuleFlags);
+    void addChildRules(const Vector<RefPtr<StyleRuleBase> >&);
     bool findBestRuleSetAndAdd(const CSSSelector&, RuleData&);
 
     void compactRules();
     static void compactPendingRules(PendingRuleMap&, CompactRuleMap&);
 
     class PendingRuleMaps {
     public:
         static PassOwnPtr<PendingRuleMaps> create() { return adoptPtr(new PendingRuleMaps); }
 
         PendingRuleMap idRules;
@@ skipping 29 matching lines @@
 #ifndef NDEBUG
     Vector<RuleData> m_allRules;
 #endif
 };
 
 } // namespace blink
 
 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::RuleData);
 
 #endif  // SKY_ENGINE_CORE_CSS_RULESET_H_