[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87
eric at webkit.org
eric at webkit.org
Wed Jan 20 22:22:27 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit d6fdc159e1a333982b6ecb9eb288441c049c577c
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Jan 13 20:40:19 2010 +0000
2010-01-13 Carol Szabo <carol.szabo at 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):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53196 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 39ca4fe..38bd156 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2010-01-13 Carol Szabo <carol.szabo at 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 at chromium.org>
No reviewer. More or less a build fix. My 53180 broke some
diff --git a/WebCore/rendering/RenderObject.cpp b/WebCore/rendering/RenderObject.cpp
index 9887869..efb3051 100644
--- a/WebCore/rendering/RenderObject.cpp
+++ b/WebCore/rendering/RenderObject.cpp
@@ -368,19 +368,14 @@ RenderObject* RenderObject::nextInPreOrderAfterChildren(RenderObject* stayWithin
if (this == stayWithin)
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();
+ const RenderObject* current = this;
+ RenderObject* next;
+ while (!(next = current->nextSibling())) {
+ current = current->parent();
+ if (!current || current == stayWithin)
+ return 0;
}
-
- return o;
+ return next;
}
RenderObject* RenderObject::previousInPreOrder() const
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list