Title: [135237] trunk/Source/WebCore
- Revision
- 135237
- Author
- commit-qu...@webkit.org
- Date
- 2012-11-19 20:18:48 -0800 (Mon, 19 Nov 2012)
Log Message
Clean up loop in NodeRenderingContext::nextRenderer and previousRenderer
https://bugs.webkit.org/show_bug.cgi?id=102743
Patch by Elliott Sprehn <espr...@chromium.org> on 2012-11-19
Reviewed by Hajime Morita.
Clean up while (true) loops in NodeRenderingContext reducing the
amount of code and the need for ASSERT_NOT_REACHED.
No new tests, just simplifcation.
* dom/NodeRenderingContext.cpp:
(WebCore::NodeRenderingContext::nextRenderer):
(WebCore::NodeRenderingContext::previousRenderer):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (135236 => 135237)
--- trunk/Source/WebCore/ChangeLog 2012-11-20 04:10:46 UTC (rev 135236)
+++ trunk/Source/WebCore/ChangeLog 2012-11-20 04:18:48 UTC (rev 135237)
@@ -1,3 +1,19 @@
+2012-11-19 Elliott Sprehn <espr...@chromium.org>
+
+ Clean up loop in NodeRenderingContext::nextRenderer and previousRenderer
+ https://bugs.webkit.org/show_bug.cgi?id=102743
+
+ Reviewed by Hajime Morita.
+
+ Clean up while (true) loops in NodeRenderingContext reducing the
+ amount of code and the need for ASSERT_NOT_REACHED.
+
+ No new tests, just simplifcation.
+
+ * dom/NodeRenderingContext.cpp:
+ (WebCore::NodeRenderingContext::nextRenderer):
+ (WebCore::NodeRenderingContext::previousRenderer):
+
2012-11-19 Shinya Kawanaka <shin...@chromium.org>
[Shadow] attribute pseudo should return empty string instead of null when nothing is specified.
Modified: trunk/Source/WebCore/dom/NodeRenderingContext.cpp (135236 => 135237)
--- trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-11-20 04:10:46 UTC (rev 135236)
+++ trunk/Source/WebCore/dom/NodeRenderingContext.cpp 2012-11-20 04:18:48 UTC (rev 135237)
@@ -94,19 +94,15 @@
return 0;
ComposedShadowTreeWalker walker(m_node);
- do {
- walker.nextSibling();
- if (!walker.get())
- return 0;
+ for (walker.nextSibling(); walker.get(); walker.nextSibling()) {
if (RenderObject* renderer = walker.get()->renderer()) {
// Do not return elements that are attached to a different flow-thread.
if (renderer->style() && !renderer->style()->flowThread().isEmpty())
continue;
return renderer;
}
- } while (true);
+ }
- ASSERT_NOT_REACHED();
return 0;
}
@@ -122,19 +118,15 @@
// however, when I tried adding it, several tests failed.
ComposedShadowTreeWalker walker(m_node);
- do {
- walker.previousSibling();
- if (!walker.get())
- return 0;
+ for (walker.previousSibling(); walker.get(); walker.previousSibling()) {
if (RenderObject* renderer = walker.get()->renderer()) {
// Do not return elements that are attached to a different flow-thread.
if (renderer->style() && !renderer->style()->flowThread().isEmpty())
continue;
return renderer;
}
- } while (true);
+ }
- ASSERT_NOT_REACHED();
return 0;
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes
