Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(210)

Unified Diff: third_party/WebKit/Source/core/dom/SelectorQuery.cpp

Issue 2785253002: Reuse executeForTraverseRoot to avoid a manual loop in SelectorQuery::findTraverseRootsAndExecute. (Closed)
Patch Set: woops Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/core/dom/SelectorQuery.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/core/dom/SelectorQuery.cpp
diff --git a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp
index 179af326688c79a32b66f4b4c9d1d47a9e46e1b0..70f869b9dff3a51444e5a540821dbacc05fac247 100644
--- a/third_party/WebKit/Source/core/dom/SelectorQuery.cpp
+++ b/third_party/WebKit/Source/core/dom/SelectorQuery.cpp
@@ -259,7 +259,9 @@ void SelectorQuery::findTraverseRootsAndExecute(
start = element;
if (startFromParent)
start = start->parentNode();
- executeForTraverseRoot<SelectorQueryTrait>(start, rootNode, output);
+ if (!start)
+ return;
+ executeForTraverseRoot<SelectorQueryTrait>(*start, rootNode, output);
return;
}
@@ -284,11 +286,8 @@ void SelectorQuery::findTraverseRootsAndExecute(
ClassElementList<OnlyRoots> traverseRoots(rootNode, selector->value());
while (!traverseRoots.isEmpty()) {
- for (Element& element :
- ElementTraversal::descendantsOf(*traverseRoots.next())) {
- if (selectorMatches(*m_selectors[0], element, rootNode))
- SelectorQueryTrait::appendElement(output, element);
- }
+ executeForTraverseRoot<SelectorQueryTrait>(*traverseRoots.next(),
+ rootNode, output);
}
return;
}
@@ -303,21 +302,19 @@ void SelectorQuery::findTraverseRootsAndExecute(
startFromParent = false;
}
- executeForTraverseRoot<SelectorQueryTrait>(&rootNode, rootNode, output);
+ executeForTraverseRoot<SelectorQueryTrait>(rootNode, rootNode, output);
}
template <typename SelectorQueryTrait>
void SelectorQuery::executeForTraverseRoot(
- ContainerNode* traverseRoot,
+ ContainerNode& traverseRoot,
ContainerNode& rootNode,
typename SelectorQueryTrait::OutputType& output) const {
DCHECK_EQ(m_selectors.size(), 1u);
- if (!traverseRoot)
- return;
const CSSSelector& selector = *m_selectors[0];
- for (Element& element : ElementTraversal::descendantsOf(*traverseRoot)) {
+ for (Element& element : ElementTraversal::descendantsOf(traverseRoot)) {
if (selectorMatches(selector, element, rootNode)) {
SelectorQueryTrait::appendElement(output, element);
if (SelectorQueryTrait::shouldOnlyMatchFirstElement)
« no previous file with comments | « third_party/WebKit/Source/core/dom/SelectorQuery.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698