1 files changed, 20 insertions, 6 deletions

diff --git a/Source/WebCore/css/CSSStyleSelector.h b/Source/WebCore/css/CSSStyleSelector.h
index 6065c2c..9f83f82 100644
--- a/Source/WebCore/css/CSSStyleSelector.h
+++ b/Source/WebCore/css/CSSStyleSelector.h
@@ -116,7 +116,7 @@ public:
         void initElement(Element*);
         RenderStyle* locateSharedStyle();
         bool matchesSiblingRules();
-        Node* locateCousinList(Element* parent, unsigned depth = 1) const;
+        Node* locateCousinList(Element* parent, unsigned& visitedNodeCount) const;
         Node* findSiblingForStyleSharing(Node*, unsigned& count) const;
         bool canShareStyleWithElement(Node*) const;
         
@@ -174,8 +174,23 @@ public:
         void addKeyframeStyle(PassRefPtr<WebKitCSSKeyframesRule> rule);
         void addPageStyle(PassRefPtr<CSSPageRule>);
 
+        bool usesSiblingRules() const { return m_features.siblingRules; }
+        bool usesFirstLineRules() const { return m_features.usesFirstLineRules; }
+        bool usesBeforeAfterRules() const { return m_features.usesBeforeAfterRules; }
+        bool usesLinkRules() const { return m_features.usesLinkRules; }
+
         static bool createTransformOperations(CSSValue* inValue, RenderStyle* inStyle, RenderStyle* rootStyle, TransformOperations& outOperations);
 
+        struct Features {
+            Features();
+            ~Features();
+            HashSet<AtomicStringImpl*> idsInRules;
+            OwnPtr<RuleSet> siblingRules;
+            bool usesFirstLineRules;
+            bool usesBeforeAfterRules;
+            bool usesLinkRules;
+        };
+
     private:
         enum SelectorMatch { SelectorMatches, SelectorFailsLocally, SelectorFailsCompletely };
 
@@ -192,7 +207,7 @@ public:
         void matchRules(RuleSet*, int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules);
         void matchRulesForList(const Vector<RuleData>*, int& firstRuleIndex, int& lastRuleIndex, bool includeEmptyRules);
         bool fastRejectSelector(const RuleData&) const;
-        void sortMatchedRules(unsigned start, unsigned end);
+        void sortMatchedRules();
         
         bool checkSelector(const RuleData&);
 
@@ -208,10 +223,9 @@ public:
         
         OwnPtr<RuleSet> m_authorStyle;
         OwnPtr<RuleSet> m_userStyle;
-        
-        OwnPtr<RuleSet> m_siblingRules;
-        HashSet<AtomicStringImpl*> m_idsInRules;
-        
+
+        Features m_features;
+
         struct ParentStackFrame {
             ParentStackFrame() {}
             ParentStackFrame(Element* element) : element(element) {}