[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d9edbbaf776cbe06a64d5c7585422592ad28d7ff
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 14 03:30:36 2010 +0000

    2010-01-13  Carol Szabo <carol.szabo at nokia.com>
    
            Reviewed by Darin Adler.
    
            CounterNode::nextInPreOrderAfterChildren(stayWithin) does not stay within.
            https://bugs.webkit.org/show_bug.cgi?id=33625
    
            No new tests because the fix should affect strictly performance.
    
            * rendering/CounterNode.cpp:
            (WebCore::CounterNode::nextInPreOrderAfterChildren):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53230 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 0f42c68..e4e3014 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-01-13  Carol Szabo <carol.szabo at nokia.com>
+
+        Reviewed by Darin Adler.
+
+        CounterNode::nextInPreOrderAfterChildren(stayWithin) does not stay within.
+        https://bugs.webkit.org/show_bug.cgi?id=33625
+
+        No new tests because the fix should affect strictly performance.
+
+        * rendering/CounterNode.cpp:
+        (WebCore::CounterNode::nextInPreOrderAfterChildren):
+
 2010-01-13  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Oliver Hunt.
diff --git a/WebCore/rendering/CounterNode.cpp b/WebCore/rendering/CounterNode.cpp
index d4d2b3d..e9350e4 100644
--- a/WebCore/rendering/CounterNode.cpp
+++ b/WebCore/rendering/CounterNode.cpp
@@ -52,18 +52,14 @@ CounterNode* CounterNode::nextInPreOrderAfterChildren(const CounterNode* stayWit
     if (this == stayWithin)
         return 0;
 
-    CounterNode* next = m_nextSibling;
-    if (next)
-        return next;
-    next = m_parent;
-    while (next && !next->m_nextSibling) {
-        if (next == stayWithin)
+    const CounterNode* current = this;
+    CounterNode* next;
+    while (!(next = current->m_nextSibling)) {
+        current = current->m_parent;
+        if (!current || current == stayWithin)
             return 0;
-        next = next->m_parent;
     }
-    if (next)
-        return next->m_nextSibling;
-    return 0;
+    return next;
 }
 
 CounterNode* CounterNode::nextInPreOrder(const CounterNode* stayWithin) const

-- 
WebKit Debian packaging