Clean up RuleSet::addChildRules()

third_party/WebKit/Source/core/css/RuleSet.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 2004-2005 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2006, 2007 Nicholas Shanks (webkit@nickshanks.com)
  * Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2007 Alexey Proskuryakov <ap@webkit.org>
  * Copyright (C) 2007, 2008 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved. (http://www.torchmobile.com/)
  * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. All rights reserved.
@@ skipping 239 matching lines @@
 
 void RuleSet::addChildRules(const HeapVector<Member<StyleRuleBase>>& rules, const MediaQueryEvaluator& medium, AddRuleFlags addRuleFlags)
 {
     for (unsigned i = 0; i < rules.size(); ++i) {
         StyleRuleBase* rule = rules[i].get();
 
         if (rule->isStyleRule()) {
             StyleRule* styleRule = toStyleRule(rule);
 
             const CSSSelectorList& selectorList = styleRule->selectorList();
-            for (size_t selectorIndex = 0; selectorIndex != kNotFound; selectorIndex = selectorList.indexOfNextSelectorAfter(selectorIndex)) {
-                if (selectorList.selectorAt(selectorIndex).hasDeepCombinatorOrShadowPseudo()) {
+            for (const CSSSelector* selector = selectorList.first(); selector; selector = selectorList.next(*selector)) {
+                size_t selectorIndex = selectorList.selectorIndex(*selector);
+                if (selector->hasDeepCombinatorOrShadowPseudo()) {
                     m_deepCombinatorOrShadowPseudoRules.append(MinimalRuleData(styleRule, selectorIndex, addRuleFlags));
-                } else if (selectorList.selectorAt(selectorIndex).hasContentPseudo()) {
+                } else if (selector->hasContentPseudo()) {
                     m_contentPseudoElementRules.append(MinimalRuleData(styleRule, selectorIndex, addRuleFlags));
-                } else if (selectorList.selectorAt(selectorIndex).hasSlottedPseudo()) {
+                } else if (selector->hasSlottedPseudo()) {
                     m_slottedPseudoElementRules.append(MinimalRuleData(styleRule, selectorIndex, addRuleFlags));
                 } else {
                     addRule(styleRule, selectorIndex, addRuleFlags);
                 }
             }
         } else if (rule->isPageRule()) {
             addPageRule(toStyleRulePage(rule));
         } else if (rule->isMediaRule()) {
             StyleRuleMedia* mediaRule = toStyleRuleMedia(rule);
             if ((!mediaRule->mediaQueries() || medium.eval(mediaRule->mediaQueries(), &m_viewportDependentMediaQueryResults, &m_deviceDependentMediaQueryResults)))
@@ skipping 118 matching lines @@
 
 #ifndef NDEBUG
 void RuleSet::show() const
 {
     for (const auto& rule: m_allRules)
         rule.selector().show();
 }
 #endif
 
 } // namespace blink