[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit 80271401d2e14f4f4164237b359bb81ffe60bb2e
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 4 23:30:30 2004 +0000

            Reviewed by Hyatt
    
            * khtml/xml/dom2_traversalimpl.cpp:
            (DOM::NodeIteratorImpl::nextNode): Change to make NodeIterators behave like the spec in that
            reference node is null until you iterate the first time.
            (DOM::NodeIteratorImpl::previousNode): Ditto.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6537 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index eb09f43..d96dbea 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,14 @@
 2004-05-04  Ken Kocienda  <kocienda at apple.com>
 
+        Reviewed by Hyatt
+
+        * khtml/xml/dom2_traversalimpl.cpp:
+        (DOM::NodeIteratorImpl::nextNode): Change to make NodeIterators behave like the spec in that
+        reference node is null until you iterate the first time. 
+        (DOM::NodeIteratorImpl::previousNode): Ditto.
+
+2004-05-04  Ken Kocienda  <kocienda at apple.com>
+
         Reviewed by me
 
         * WebCore.pbproj/project.pbxproj: Backed out unintentional
diff --git a/WebCore/khtml/xml/dom2_traversalimpl.cpp b/WebCore/khtml/xml/dom2_traversalimpl.cpp
index bd094e6..fd2dc27 100644
--- a/WebCore/khtml/xml/dom2_traversalimpl.cpp
+++ b/WebCore/khtml/xml/dom2_traversalimpl.cpp
@@ -268,15 +268,17 @@ NodeImpl *NodeIteratorImpl::nextNode(int &exceptioncode)
     }
 
     NodeImpl *result = 0;
-    if (pointerBeforeReferenceNode() && acceptNode(referenceNode()) == NodeFilter::FILTER_ACCEPT)
-        result = referenceNode();
-    else {
-        result = findNextNode(referenceNode());
-        if (result)
-            setReferenceNode(result);
-    }
+    NodeImpl *refNode = referenceNode() ? referenceNode() : root();
 
+    if (pointerBeforeReferenceNode() && acceptNode(refNode) == NodeFilter::FILTER_ACCEPT)
+        result = refNode;
+    else
+        result = findNextNode(refNode);
+
+    if (result)
+        setReferenceNode(result);
     setPointerBeforeReferenceNode(false);
+
     return result;
 }
 
@@ -288,15 +290,17 @@ NodeImpl *NodeIteratorImpl::previousNode(int &exceptioncode)
     }
 
     NodeImpl *result = 0;
-    if (!pointerBeforeReferenceNode() && acceptNode(referenceNode()) == NodeFilter::FILTER_ACCEPT)
-        result = referenceNode();
-    else {
-        result = findPreviousNode(referenceNode());
-        if (result)
-            setReferenceNode(result);
-    }
+    NodeImpl *refNode = referenceNode() ? referenceNode() : root();
 
+    if (!pointerBeforeReferenceNode() && acceptNode(refNode) == NodeFilter::FILTER_ACCEPT)
+        result = refNode;
+    else
+        result = findPreviousNode(refNode);
+
+    if (result)
+        setReferenceNode(result);
     setPointerBeforeReferenceNode();
+
     return result;
 }
 

-- 
WebKit Debian packaging