Reviewed by Chris.

	- fix recursive item traversal, use traverseNextNode() instead of
	the buggy hand-rolled traversal.

        * khtml/xml/dom_nodeimpl.cpp:
        (NodeListImpl::recursiveItem):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@8042 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 99e54b94fe9d6e9febb3b3b00bfbeced61e0d3f8..26527195b9bde4fe71fcfe5034f8a7ac0684e194 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,13 @@
+2004-11-18  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Chris.
+
+       - fix recursive item traversal, use traverseNextNode() instead of
+       the buggy hand-rolled traversal.
+
+        * khtml/xml/dom_nodeimpl.cpp:
+        (NodeListImpl::recursiveItem):
+

 2004-11-17  Darin Adler  <darin@apple.com>
 
         Reviewed by Ken.
 2004-11-17  Darin Adler  <darin@apple.com>
 
         Reviewed by Ken.

diff --git a/WebCore/khtml/xml/dom_nodeimpl.cpp b/WebCore/khtml/xml/dom_nodeimpl.cpp
index 17416bbbdbf172cf251e4a32d0317e83c064d22e..0d5976352dab2e5debaa71cda68e4b1802f515dd 100644 (file)
--- a/WebCore/khtml/xml/dom_nodeimpl.cpp
+++ b/WebCore/khtml/xml/dom_nodeimpl.cpp
@@ -2331,10 +2331,9 @@ NodeImpl *NodeListImpl::recursiveItem ( unsigned long offset, NodeImpl *start) c
         }
     }
 
         }
     }
 

-    NodeImpl *end = rootNode->nextSibling();

     NodeImpl *n = start;
 
     NodeImpl *n = start;
 

-    while (n != 0 && n != end) {
+    while (n) {

         if ( n->nodeType() == Node::ELEMENT_NODE ) {
             if (nodeMatches(n)) {
                 if (!remainingOffset) {
         if ( n->nodeType() == Node::ELEMENT_NODE ) {
             if (nodeMatches(n)) {
                 if (!remainingOffset) {


@@ -2347,15 +2346,7 @@ NodeImpl *NodeListImpl::recursiveItem ( unsigned long offset, NodeImpl *start) c
             }
         }
 
             }
         }
 

-        if (n->firstChild()) {
-            n = n->firstChild();
-        } else if (n->nextSibling()) {
-            n = n->nextSibling();
-        } else if (n->parentNode()) {
-            n = n->parentNode()->nextSibling();
-        } else {
-            n = 0;
-        }
+        n = n->traverseNextNode(rootNode);

     }
 
     return 0; // no matching node in this subtree
     }
 
     return 0; // no matching node in this subtree