Eliminate RuleRange.

sky/engine/core/css/resolver/MatchResult.h

Index: sky/engine/core/css/resolver/MatchResult.h
diff --git a/sky/engine/core/css/resolver/MatchResult.h b/sky/engine/core/css/resolver/MatchResult.h
index c1694b3bf32eb827b63c6beea246b809cf2b32c8..10b8677f34f00b5cb7fdc581725a440e7d150c35 100644
--- a/sky/engine/core/css/resolver/MatchResult.h
+++ b/sky/engine/core/css/resolver/MatchResult.h
@@ -23,8 +23,6 @@
 #ifndef SKY_ENGINE_CORE_CSS_RESOLVER_MATCHRESULT_H_
 #define SKY_ENGINE_CORE_CSS_RESOLVER_MATCHRESULT_H_
 
-#include "sky/engine/core/css/RuleSet.h"
-#include "sky/engine/core/css/SelectorChecker.h"
 #include "sky/engine/platform/heap/Handle.h"
 #include "sky/engine/wtf/RefPtr.h"
 #include "sky/engine/wtf/Vector.h"
@@ -33,71 +31,16 @@ namespace blink {
 
 class StylePropertySet;
 
-struct RuleRange {
-    RuleRange(int& firstRuleIndex, int& lastRuleIndex): firstRuleIndex(firstRuleIndex), lastRuleIndex(lastRuleIndex) { }
-    int& firstRuleIndex;
-    int& lastRuleIndex;
-};
-
-struct MatchRanges {
-    MatchRanges() : firstUARule(-1), lastUARule(-1), firstAuthorRule(-1), lastAuthorRule(-1) { }
-    int firstUARule;
-    int lastUARule;
-    int firstAuthorRule;
-    int lastAuthorRule;
-    RuleRange UARuleRange() { return RuleRange(firstUARule, lastUARule); }
-    RuleRange authorRuleRange() { return RuleRange(firstAuthorRule, lastAuthorRule); }
-};
-
-struct MatchedProperties {
-    ALLOW_ONLY_INLINE_ALLOCATION();
-public:
-    MatchedProperties();
-    ~MatchedProperties();
-
-    RefPtr<StylePropertySet> properties;
-};
-
-} // namespace blink
-
-WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::MatchedProperties);
-
-namespace blink {
-
 class MatchResult {
     STACK_ALLOCATED();
 public:
     MatchResult() : isCacheable(true) { }
-    Vector<MatchedProperties, 64> matchedProperties;
-    MatchRanges ranges;
+    Vector<RefPtr<StylePropertySet>, 64> matchedProperties;
     bool isCacheable;
 
-    void addMatchedProperties(const StylePropertySet* properties);
+    void addMatchedProperties(const StylePropertySet*);
 };
 
-inline bool operator==(const MatchRanges& a, const MatchRanges& b)
-{
-    return a.firstUARule == b.firstUARule
-        && a.lastUARule == b.lastUARule
-        && a.firstAuthorRule == b.firstAuthorRule
-        && a.lastAuthorRule == b.lastAuthorRule;
-}
-
-inline bool operator!=(const MatchRanges& a, const MatchRanges& b)
-{
-    return !(a == b);
-}
-
-inline bool operator==(const MatchedProperties& a, const MatchedProperties& b)
-{
-    return a.properties == b.properties;
-}
-
-inline bool operator!=(const MatchedProperties& a, const MatchedProperties& b)
-{
-    return !(a == b);
-}
-
 } // namespace blink
 
 #endif  // SKY_ENGINE_CORE_CSS_RESOLVER_MATCHRESULT_H_