Clean up RuleSet::addChildRules()

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

 /*
  * Copyright (C) 1999-2003 Lars Knoll (knoll@kde.org)
  *               1999 Waldo Bastian (bastian@kde.org)
  *               2001 Andreas Schlapbach (schlpbch@iam.unibe.ch)
  *               2001-2003 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2002, 2006, 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2008 David Smith (catfish.man@gmail.com)
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
@@ skipping 895 matching lines @@
     for (const CSSSelector* current = this; current; current = current->tagHistory()) {
         if (current->match() == PseudoElement)
             return true;
         if (current->relation() != SubSelector)
             return false;
     }
     return false;
 }
 
 template <typename Functor>
-static bool forEachTagSelector(const Functor& functor, const CSSSelector& selector)
+static bool forEachTagHistory(const Functor& functor, const CSSSelector& selector)
 {
     for (const CSSSelector* current = &selector; current; current = current->tagHistory()) {
         if (functor(*current))
             return true;
         if (const CSSSelectorList* selectorList = current->selectorList()) {
             for (const CSSSelector* subSelector = selectorList->first(); subSelector; subSelector = CSSSelectorList::next(*subSelector)) {
-                if (forEachTagSelector(functor, *subSelector))
+                if (forEachTagHistory(functor, *subSelector))
                     return true;
             }
         }
     }
 
     return false;
 }
 
 bool CSSSelector::hasContentPseudo() const
 {
-    return forEachTagSelector([](const CSSSelector& selector) -> bool {
+    return forEachTagHistory([](const CSSSelector& selector) -> bool {
         return selector.relationIsAffectedByPseudoContent();
     }, *this);
 }
 
 bool CSSSelector::hasSlottedPseudo() const
 {
-    return forEachTagSelector([](const CSSSelector& selector) ->  bool {
+    return forEachTagHistory([](const CSSSelector& selector) ->  bool {
         return selector.getPseudoType() == CSSSelector::PseudoSlotted;
     }, *this);
 }
 
 bool CSSSelector::hasDeepCombinatorOrShadowPseudo() const
 {
-    return forEachTagSelector([](const CSSSelector& selector) -> bool {
+    return forEachTagHistory([](const CSSSelector& selector) -> bool {
         return selector.relation() == CSSSelector::ShadowDeep || selector.getPseudoType() == CSSSelector::PseudoShadow;
     }, *this);
 }
 
 bool CSSSelector::needsUpdatedDistribution() const
 {
-    return forEachTagSelector([](const CSSSelector& selector) -> bool {
+    return forEachTagHistory([](const CSSSelector& selector) -> bool {
         return selector.relationIsAffectedByPseudoContent() || selector.getPseudoType() == CSSSelector::PseudoSlotted || selector.getPseudoType() == CSSSelector::PseudoHostContext;
     }, *this);
 }
 
 CSSSelector::RareData::RareData(const AtomicString& value)
     : m_matchingValue(value)
     , m_serializingValue(value)
     , m_bits()
     , m_attribute(anyQName())
     , m_argument(nullAtom)
@@ skipping 13 matching lines @@
         if (count < nthBValue())
             return false;
         return (count - nthBValue()) % nthAValue() == 0;
     }
     if (count > nthBValue())
         return false;
     return (nthBValue() - count) % (-nthAValue()) == 0;
 }
 
 } // namespace blink