Changeset 150099 in webkit

Timestamp:

May 14, 2013 8:17:43 PM (11 years ago)

Author:

rniwa@webkit.org

Message:

Use ElementTraversal in SelectorDataList::execute
​https://bugs.webkit.org/show_bug.cgi?id=116131

Reviewed by Darin Adler.

Use ElementTraversal::firstWithin and ElementTraversal::next to simplify the code.

• dom/SelectorQuery.cpp:

(WebCore::SelectorDataList::execute):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/SelectorQuery.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Use ElementTraversal in SelectorDataList::execute
+        https://bugs.webkit.org/show_bug.cgi?id=116131
+
+        Reviewed by Darin Adler.
+
+        Use ElementTraversal::firstWithin and ElementTraversal::next to simplify the code.
+
+        * dom/SelectorQuery.cpp:
+        (WebCore::SelectorDataList::execute):
+
 2013-05-14  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/dom/SelectorQuery.cpp

@@ -30 +30 @@
 #include "CSSSelectorList.h"
 #include "Document.h"
+#include "NodeTraversal.h"
 #include "SelectorChecker.h"
 #include "SelectorCheckerFastPath.h"
@@ -136 +137 @@
 
     unsigned selectorCount = m_selectors.size();
-
-    Node* n = rootNode->firstChild();
-    while (n) {
-        if (n->isElementNode()) {
-            Element* element = toElement(n);
-            for (unsigned i = 0; i < selectorCount; ++i) {
-                if (selectorMatches(m_selectors[i], element, rootNode)) {
-                    matchedElements.append(element);
-                    if (firstMatchOnly)
-                        return;
-                    break;
-                }
-            }
-            if (element->firstChild()) {
-                n = element->firstChild();
-                continue;
+    for (Element* element = ElementTraversal::firstWithin(rootNode); element; element = ElementTraversal::next(element, rootNode)) {
+        for (unsigned i = 0; i < selectorCount; ++i) {
+            if (selectorMatches(m_selectors[i], element, rootNode)) {
+                matchedElements.append(element);
+                if (firstMatchOnly)
+                    return;
+                break;
             }
         }
-        while (!n->nextSibling()) {
-            n = n->parentNode();
-            if (n == rootNode)
-                return;
-        }
-        n = n->nextSibling();
     }
 }