Changeset 53196 in webkit

Timestamp:

Jan 13, 2010 12:40:19 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-01-13 Carol Szabo <​carol.szabo@nokia.com>

Reviewed by Darin Adler.

RenderObject::nextInPreOrderAfterChildren(RenderObject* stayWithin) does not stay within
​https://bugs.webkit.org/show_bug.cgi?id=33600

No new tests as this fix affects mainly performance.
No test has been found yet that could evidence the bug in the layout
of a page, but the fix to bug 32884 exposes this bug on some pages
such as ​http://www.w3.org/Style/CSS/Test/CSS2.1/current/html4/counters-scope-implied-001.htm

• rendering/RenderObject.cpp: (WebCore::RenderObject::nextInPreOrderAfterChildren):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-13  Carol Szabo  <carol.szabo@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        RenderObject::nextInPreOrderAfterChildren(RenderObject* stayWithin) does not stay within
+        https://bugs.webkit.org/show_bug.cgi?id=33600
+
+        No new tests as this fix affects mainly performance.
+        No test has been found yet that could evidence the bug in the layout
+        of a page, but the fix to bug 32884 exposes this bug on some pages
+        such as http://www.w3.org/Style/CSS/Test/CSS2.1/current/html4/counters-scope-implied-001.htm
+
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::nextInPreOrderAfterChildren):
+
 2010-01-13  Jeremy Orlow  <jorlow@chromium.org>
 

trunk/WebCore/rendering/RenderObject.cpp

@@ -369 +369 @@
         return 0;
 
-    RenderObject* o;
-    if (!(o = nextSibling())) {
-        o = parent();
-        while (o && !o->nextSibling()) {
-            if (o == stayWithin)
-                return 0;
-            o = o->parent();
-        }
-        if (o)
-            o = o->nextSibling();
-    }
-
-    return o;
+    const RenderObject* current = this;
+    RenderObject* next;
+    while (!(next = current->nextSibling())) {
+        current = current->parent();
+        if (!current || current == stayWithin)
+            return 0;
+    }
+    return next;
 }