Inline SelectorQuery::executeForTraverseRoots into findTraverseRootsAndExecute.

third_party/WebKit/Source/core/dom/SelectorQuery.cpp

 /*
  * Copyright (C) 2011, 2013 Apple Inc. All rights reserved.
  * Copyright (C) 2014 Samsung Electronics. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
@@ skipping 260 matching lines @@
       return;
     }
 
     // If we have both CSSSelector::Id and CSSSelector::Class at the same time,
     // we should use Id to find traverse root.
     if (!SelectorQueryTrait::shouldOnlyMatchFirstElement && !startFromParent &&
         selector->match() == CSSSelector::Class) {
       if (isRightmostSelector) {
         ClassElementList<AllElements> traverseRoots(rootNode,
                                                     selector->value());
-        executeForTraverseRoots<SelectorQueryTrait>(
-            traverseRoots, MatchesTraverseRoots, rootNode, output);
+        while (!traverseRoots.isEmpty()) {
+          Element& element = *traverseRoots.next();
+          if (selectorMatches(*m_selectors[0], element, rootNode))
+            SelectorQueryTrait::appendElement(output, element);
+        }
         return;
       }
       // Since there exists some ancestor element which has the class name, we
       // need to see all children of rootNode.
-      if (ancestorHasClassName(rootNode, selector->value())) {
-        executeForTraverseRoot<SelectorQueryTrait>(&rootNode, rootNode, output);
-        return;
-      }
+      if (ancestorHasClassName(rootNode, selector->value()))
+        break;

[esprehn, 2017/03/29 05:00:43]

This was just executing the code below if we had not found anything in the loop,
the break achieves the same result.

 
       ClassElementList<OnlyRoots> traverseRoots(rootNode, selector->value());
-      executeForTraverseRoots<SelectorQueryTrait>(
-          traverseRoots, DoesNotMatchTraverseRoots, rootNode, output);
+      while (!traverseRoots.isEmpty()) {
+        for (Element& element :
+             ElementTraversal::descendantsOf(*traverseRoots.next())) {
+          if (selectorMatches(*m_selectors[0], element, rootNode))
+            SelectorQueryTrait::appendElement(output, element);
+        }
+      }
       return;
     }
 
     if (selector->relation() == CSSSelector::SubSelector)
       continue;
     isRightmostSelector = false;
     if (selector->relation() == CSSSelector::DirectAdjacent ||
         selector->relation() == CSSSelector::IndirectAdjacent)
       startFromParent = true;
     else
@@ skipping 16 matching lines @@
 
   for (Element& element : ElementTraversal::descendantsOf(*traverseRoot)) {
     if (selectorMatches(selector, element, rootNode)) {
       SelectorQueryTrait::appendElement(output, element);
       if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
         return;
     }
   }
 }
 
-template <typename SelectorQueryTrait, typename SimpleElementListType>
-void SelectorQuery::executeForTraverseRoots(
-    SimpleElementListType& traverseRoots,
-    MatchTraverseRootState matchTraverseRoots,
-    ContainerNode& rootNode,
-    typename SelectorQueryTrait::OutputType& output) const {
-  DCHECK_EQ(m_selectors.size(), 1u);
-
-  if (traverseRoots.isEmpty())
-    return;
-
-  const CSSSelector& selector = *m_selectors[0];
-
-  if (matchTraverseRoots) {
-    while (!traverseRoots.isEmpty()) {
-      Element& element = *traverseRoots.next();
-      if (selectorMatches(selector, element, rootNode)) {
-        SelectorQueryTrait::appendElement(output, element);
-        if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
-          return;
-      }
-    }
-    return;
-  }
-
-  while (!traverseRoots.isEmpty()) {
-    for (Element& element :
-         ElementTraversal::descendantsOf(*traverseRoots.next())) {
-      if (selectorMatches(selector, element, rootNode)) {
-        SelectorQueryTrait::appendElement(output, element);
-        if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
-          return;
-      }
-    }
-  }
-}
-
 template <typename SelectorQueryTrait>
 bool SelectorQuery::selectorListMatches(
     ContainerNode& rootNode,
     Element& element,
     typename SelectorQueryTrait::OutputType& output) const {
   for (const auto& selector : m_selectors) {
     if (selectorMatches(*selector, element, rootNode)) {
       SelectorQueryTrait::appendElement(output, element);
       return true;
     }
@@ skipping 230 matching lines @@
   return m_entries
       .insert(selectors, SelectorQuery::adopt(std::move(selectorList)))
       .storedValue->value.get();
 }
 
 void SelectorQueryCache::invalidate() {
   m_entries.clear();
 }
 
 }  // namespace blink