Refactor matched rule ranges.

Source/core/css/resolver/MatchResult.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.
  * Copyright (C) 2013 Google 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.
  *
@@ skipping 15 matching lines @@
 #include "core/css/RuleSet.h"
 #include "core/css/SelectorChecker.h"
 #include "platform/heap/Handle.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 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();
 
     DECLARE_TRACE();
 
     RefPtrWillBeMember<StylePropertySet> properties;
 
     union {
         struct {
             unsigned linkMatchType : 2;
             unsigned whitelistType : 2;
         } m_types;
         // Used to make sure all memory is zero-initialized since we compute the hash over the bytes of this object.
         void* possiblyPaddedMember;
     };
 };
 
 } // namespace blink
 
 WTF_ALLOW_MOVE_AND_INIT_WITH_MEM_FUNCTIONS(blink::MatchedProperties);
 
 namespace blink {
 
 class MatchResult {
     STACK_ALLOCATED();
 public:
-    MatchResult() : isCacheable(true) { }
+    void addMatchedProperties(const StylePropertySet* properties, unsigned linkMatchType = CSSSelector::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
+
+    int firstRule() const { return 0; }
+    int lastRule() const { return matchedProperties.size() - 1; }
+    int firstUARule() const { return lastUARuleIndex == -1 ? -1 : 0; }
+    int lastUARule() const { return lastUARuleIndex; }
+    int firstAuthorRule() const { return lastUARuleIndex + 1; }
+    int lastAuthorRule() const { return lastRule(); }
+
     WillBeHeapVector<MatchedProperties, 64> matchedProperties;
-    MatchRanges ranges;
-    bool isCacheable;
-
-    void addMatchedProperties(const StylePropertySet* properties, unsigned linkMatchType = CSSSelector::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
+    int lastUARuleIndex = -1;
+    bool isCacheable = true;
 };
 
 inline bool operator==(const MatchedProperties& a, const MatchedProperties& b)
 {
     return a.properties == b.properties && a.m_types.linkMatchType == b.m_types.linkMatchType;
 }
 
 inline bool operator!=(const MatchedProperties& a, const MatchedProperties& b)
 {
     return !(a == b);
 }
 
 } // namespace blink
 
 #endif // MatchResult_h