<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[161278] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/161278">161278</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-03 12:22:09 -0800 (Fri, 03 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Deploy more child renderer iterators in RenderBlockFlow.
<https://webkit.org/b/126434>
Reviewed by Sam Weinig.
* rendering/RenderBlockFlow.cpp:
(WebCore::shouldCheckLines):
Make this helper take a RenderBlockFlow instead of a RenderObject
and simplified it a bit. RenderDeprecatedFlexibleBox does not
derive from RenderBlockFlow so those checks can be omitted.
(WebCore::RenderBlockFlow::layoutBlock):
(WebCore::RenderBlockFlow::markAllDescendantsWithFloatsForLayout):
(WebCore::RenderBlockFlow::lineAtIndex):
(WebCore::RenderBlockFlow::lineCount):
(WebCore::RenderBlockFlow::clearTruncation):
Use childrenOfType to iterate over block and block-flow children.
Tweaked some early return/continue to reduce nesting.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161277 => 161278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-03 20:16:38 UTC (rev 161277)
+++ trunk/Source/WebCore/ChangeLog 2014-01-03 20:22:09 UTC (rev 161278)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-03 Andreas Kling <akling@apple.com>
+
+ Deploy more child renderer iterators in RenderBlockFlow.
+ <https://webkit.org/b/126434>
+
+ Reviewed by Sam Weinig.
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::shouldCheckLines):
+
+ Make this helper take a RenderBlockFlow instead of a RenderObject
+ and simplified it a bit. RenderDeprecatedFlexibleBox does not
+ derive from RenderBlockFlow so those checks can be omitted.
+
+ (WebCore::RenderBlockFlow::layoutBlock):
+ (WebCore::RenderBlockFlow::markAllDescendantsWithFloatsForLayout):
+ (WebCore::RenderBlockFlow::lineAtIndex):
+ (WebCore::RenderBlockFlow::lineCount):
+ (WebCore::RenderBlockFlow::clearTruncation):
+
+ Use childrenOfType to iterate over block and block-flow children.
+ Tweaked some early return/continue to reduce nesting.
+
</ins><span class="cx"> 2014-01-03 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow different types of ScrollingTrees to have different types of ScrollingTreeNode subclasses
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (161277 => 161278)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-01-03 20:16:38 UTC (rev 161277)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-01-03 20:22:09 UTC (rev 161278)
</span><span class="lines">@@ -386,12 +386,11 @@
</span><span class="cx"> if (oldHeight != newHeight) {
</span><span class="cx"> if (oldHeight > newHeight && maxFloatLogicalBottom > newHeight && !childrenInline()) {
</span><span class="cx"> // One of our children's floats may have become an overhanging float for us. We need to look for it.
</span><del>- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
- if (child->isRenderBlockFlow() && !child->isFloatingOrOutOfFlowPositioned()) {
- RenderBlockFlow& block = toRenderBlockFlow(*child);
- if (block.lowestFloatLogicalBottom() + block.logicalTop() > newHeight)
- addOverhangingFloats(block, false);
- }
</del><ins>+ for (auto& blockFlow : childrenOfType<RenderBlockFlow>(*this)) {
+ if (blockFlow.isFloatingOrOutOfFlowPositioned())
+ continue;
+ if (blockFlow.lowestFloatLogicalBottom() + blockFlow.logicalTop() > newHeight)
+ addOverhangingFloats(blockFlow, false);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2462,21 +2461,21 @@
</span><span class="cx"> if (floatToRemove)
</span><span class="cx"> removeFloatingObject(*floatToRemove);
</span><span class="cx">
</span><ins>+ if (childrenInline())
+ return;
+
</ins><span class="cx"> // Iterate over our children and mark them as needed.
</span><del>- if (!childrenInline()) {
- for (RenderObject* child = firstChild(); child; child = child->nextSibling()) {
- if ((!floatToRemove && child->isFloatingOrOutOfFlowPositioned()) || !child->isRenderBlock())
- continue;
- if (!child->isRenderBlockFlow()) {
- RenderBlock* childBlock = toRenderBlock(child);
- if (childBlock->shrinkToAvoidFloats() && childBlock->everHadLayout())
- childBlock->setChildNeedsLayout(markParents);
- continue;
- }
- RenderBlockFlow* childBlock = toRenderBlockFlow(child);
- if ((floatToRemove ? childBlock->containsFloat(*floatToRemove) : childBlock->containsFloats()) || childBlock->shrinkToAvoidFloats())
- childBlock->markAllDescendantsWithFloatsForLayout(floatToRemove, inLayout);
</del><ins>+ for (auto& block : childrenOfType<RenderBlock>(*this)) {
+ if (!floatToRemove && block.isFloatingOrOutOfFlowPositioned())
+ continue;
+ if (!block.isRenderBlockFlow()) {
+ if (block.shrinkToAvoidFloats() && block.everHadLayout())
+ block.setChildNeedsLayout(markParents);
+ continue;
</ins><span class="cx"> }
</span><ins>+ auto& blockFlow = toRenderBlockFlow(block);
+ if ((floatToRemove ? blockFlow.containsFloat(*floatToRemove) : blockFlow.containsFloats()) || blockFlow.shrinkToAvoidFloats())
+ blockFlow.markAllDescendantsWithFloatsForLayout(floatToRemove, inLayout);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2862,9 +2861,9 @@
</span><span class="cx"> rareData.m_renderNamedFlowFragment = flowFragment;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool shouldCheckLines(RenderObject& obj)
</del><ins>+static bool shouldCheckLines(const RenderBlockFlow& blockFlow)
</ins><span class="cx"> {
</span><del>- return !obj.isFloatingOrOutOfFlowPositioned() && !obj.isRunIn() && obj.isRenderBlockFlow() && obj.style().height().isAuto() && (!obj.isDeprecatedFlexibleBox() || obj.style().boxOrient() == VERTICAL);
</del><ins>+ return !blockFlow.isFloatingOrOutOfFlowPositioned() && !blockFlow.isRunIn() && blockFlow.style().height().isAuto();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RootInlineBox* RenderBlockFlow::lineAtIndex(int i) const
</span><span class="lines">@@ -2879,15 +2878,16 @@
</span><span class="cx"> if (!i--)
</span><span class="cx"> return box;
</span><span class="cx"> }
</span><del>- } else {
- for (auto child = firstChild(); child; child = child->nextSibling()) {
- if (!shouldCheckLines(*child))
- continue;
- if (RootInlineBox* box = toRenderBlockFlow(child)->lineAtIndex(i))
- return box;
- }
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ for (auto& blockFlow : childrenOfType<RenderBlockFlow>(*this)) {
+ if (!shouldCheckLines(blockFlow))
+ continue;
+ if (RootInlineBox* box = blockFlow.lineAtIndex(i))
+ return box;
+ }
+
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2907,17 +2907,18 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- } else {
- for (auto child = firstChild(); child; child = child->nextSibling()) {
- if (shouldCheckLines(*child)) {
- bool recursiveFound = false;
- count += toRenderBlockFlow(child)->lineCount(stopRootInlineBox, &recursiveFound);
- if (recursiveFound) {
- if (found)
- *found = true;
- break;
- }
- }
</del><ins>+ return count;
+ }
+
+ for (auto& blockFlow : childrenOfType<RenderBlockFlow>(*this)) {
+ if (!shouldCheckLines(blockFlow))
+ continue;
+ bool recursiveFound = false;
+ count += blockFlow.lineCount(stopRootInlineBox, &recursiveFound);
+ if (recursiveFound) {
+ if (found)
+ *found = true;
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2937,7 +2938,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> RenderBox* normalFlowChildWithoutLines = 0;
</span><span class="cx"> for (auto obj = block.firstChildBox(); obj; obj = obj->nextSiblingBox()) {
</span><del>- if (shouldCheckLines(*obj)) {
</del><ins>+ if (obj->isRenderBlockFlow() && shouldCheckLines(toRenderBlockFlow(*obj))) {
</ins><span class="cx"> int result = getHeightForLineCount(toRenderBlockFlow(*obj), lineCount, false, count);
</span><span class="cx"> if (result != -1)
</span><span class="cx"> return result + obj->y() + (includeBottom ? (block.borderBottom() + block.paddingBottom()) : LayoutUnit());
</span><span class="lines">@@ -2968,12 +2969,13 @@
</span><span class="cx"> setHasMarkupTruncation(false);
</span><span class="cx"> for (auto box = firstRootBox(); box; box = box->nextRootBox())
</span><span class="cx"> box->clearTruncation();
</span><del>- } else {
- for (auto child = firstChild(); child; child = child->nextSibling()) {
- if (shouldCheckLines(*child))
- toRenderBlockFlow(child)->clearTruncation();
- }
</del><ins>+ return;
</ins><span class="cx"> }
</span><ins>+
+ for (auto& blockFlow : childrenOfType<RenderBlockFlow>(*this)) {
+ if (shouldCheckLines(blockFlow))
+ blockFlow.clearTruncation();
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBlockFlow::containsNonZeroBidiLevel() const
</span></span></pre>
</div>
</div>
</body>
</html>