Refactoring MatchRanges and RuleRange.

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 "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class StylePropertySet;
 class StyleRule;
 
-struct RuleRange {
-    RuleRange(int& firstRuleIndex, int& lastRuleIndex): firstRuleIndex(firstRuleIndex), lastRuleIndex(lastRuleIndex) { }
-    int& firstRuleIndex;
-    int& lastRuleIndex;
+class RuleRange {
+public:
+    RuleRange() :  m_firstRuleIndex(-1), m_lastRuleIndex(-1) { }
+    RuleRange(int firstRuleIndex, int lastRuleIndex) : m_firstRuleIndex(firstRuleIndex), m_lastRuleIndex(lastRuleIndex) { }

[esprehn, 2014/03/27 08:41:59]

The initializer should be on a different line.

RuleRange(...)
 : m_firstRuleIndex(...)
 , m_lastRuleIndex(...)
{
}

+
+    int first() const { return m_firstRuleIndex; }
+    int last() const { return m_lastRuleIndex; }
+
+    bool collapsed() const { return m_firstRuleIndex == -1; }
+
+    void setLast(int position) { m_lastRuleIndex = position; }
+
+    void shiftLast(int position)
+    {
+        m_lastRuleIndex = position;

[esprehn, 2014/03/27 08:41:59]

This doesn't seem to shift the last, it seems to actually set it?

+        if (m_firstRuleIndex == -1)
+            m_firstRuleIndex = position;
+    }
+
+    void shiftLastByOne()
+    {
+        ++m_lastRuleIndex;
+        if (m_firstRuleIndex == -1)
+            m_firstRuleIndex = m_lastRuleIndex;
+    }
+
+private:
+    int m_firstRuleIndex;
+    int m_lastRuleIndex;
 };
 
-struct MatchRanges {
-    MatchRanges() : firstUARule(-1), lastUARule(-1), firstAuthorRule(-1), lastAuthorRule(-1), firstUserRule(-1), lastUserRule(-1) { }
-    int firstUARule;
-    int lastUARule;
-    int firstAuthorRule;
-    int lastAuthorRule;
-    int firstUserRule;
-    int lastUserRule;
-    RuleRange UARuleRange() { return RuleRange(firstUARule, lastUARule); }
-    RuleRange authorRuleRange() { return RuleRange(firstAuthorRule, lastAuthorRule); }
-    RuleRange userRuleRange() { return RuleRange(firstUserRule, lastUserRule); }
+inline bool operator==(const RuleRange& a, const RuleRange& b)
+{
+    return a.first() == b.first() && a.last() == b.last();
+}
+
+class MatchRanges {
+public:
+    MatchRanges() { }

[esprehn, 2014/03/27 08:41:59]

Leave off the default constructor, the compiler will make it for you.

+
+    RuleRange& UARuleRange() { return m_uaRuleRange; }

[esprehn, 2014/03/27 08:41:59]

ua should be lower case.

+    RuleRange& authorRuleRange() { return m_authorRuleRange; }
+    RuleRange& userRuleRange() { return m_userRuleRange; }
+
+    const RuleRange& UARuleRange() const { return m_uaRuleRange; }

[esprehn, 2014/03/27 08:41:59]

ditto

+    const RuleRange& authorRuleRange() const { return m_authorRuleRange; }
+    const RuleRange& userRuleRange() const { return m_userRuleRange; }
+
+private:
+    RuleRange m_uaRuleRange;
+    RuleRange m_authorRuleRange;
+    RuleRange m_userRuleRange;
 };
 
 struct MatchedProperties {
     MatchedProperties();
     ~MatchedProperties();
 
     RefPtr<StylePropertySet> properties;
     union {
         struct {
             unsigned linkMatchType : 2;
@@ skipping 11 matching lines @@
     Vector<MatchedProperties, 64> matchedProperties;
     WillBeHeapVector<RawPtrWillBeMember<StyleRule>, 64> matchedRules;
     MatchRanges ranges;
     bool isCacheable;
 
     void addMatchedProperties(const StylePropertySet* properties, StyleRule* = 0, unsigned linkMatchType = SelectorChecker::MatchAll, PropertyWhitelistType = PropertyWhitelistNone);
 };
 
 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
-        && a.firstUserRule == b.firstUserRule
-        && a.lastUserRule == b.lastUserRule;
+    return a.UARuleRange() == b.UARuleRange() && a.authorRuleRange() == b.authorRuleRange() && a.userRuleRange() == b.userRuleRange();
 }
 
 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 && a.linkMatchType == b.linkMatchType;
 }
 
 inline bool operator!=(const MatchedProperties& a, const MatchedProperties& b)
 {
     return !(a == b);
 }
 
 } // namespace WebCore
 
 #endif // MatchResult_h