<!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>[162737] 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/162737">162737</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-01-24 16:21:59 -0800 (Fri, 24 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Replace LayoutUnit() calls to a more descriptive LayoutUnit::fromPixel(int).
https://bugs.webkit.org/show_bug.cgi?id=127580
Reviewed by Simon Fraser.
LayoutUnit(1) statement is ambiguous. While it is intended to set one (CSS) pixel, it
could be interpreted as 1 layout unit (1/64th of a CSS pixel atm).
No change in behavior.
* inspector/InspectorOverlay.cpp:
(WebCore::buildObjectForRegionHighlight):
* rendering/FloatingObjects.cpp:
(WebCore::ComputeFloatOffsetForFloatLayoutAdapter<FloatTypeValue>::heightRemaining):
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::layoutShapeInsideInfo):
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::collapseMargins):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::mainAxisContentExtent):
(WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
(WebCore::RenderFlexibleBox::alignChildren):
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::RenderMultiColumnFlowThread::addForcedRegionBreak):
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::heightAdjustedForSetOffset):
(WebCore::RenderMultiColumnSet::calculateBalancedHeight):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorOverlaycpp">trunk/Source/WebCore/inspector/InspectorOverlay.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingFloatingObjectscpp">trunk/Source/WebCore/rendering/FloatingObjects.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162736 => 162737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-25 00:04:18 UTC (rev 162736)
+++ trunk/Source/WebCore/ChangeLog 2014-01-25 00:21:59 UTC (rev 162737)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2014-01-24 Zalan Bujtas <zalan@apple.com>
+
+ Replace LayoutUnit() calls to a more descriptive LayoutUnit::fromPixel(int).
+ https://bugs.webkit.org/show_bug.cgi?id=127580
+
+ Reviewed by Simon Fraser.
+
+ LayoutUnit(1) statement is ambiguous. While it is intended to set one (CSS) pixel, it
+ could be interpreted as 1 layout unit (1/64th of a CSS pixel atm).
+
+ No change in behavior.
+
+ * inspector/InspectorOverlay.cpp:
+ (WebCore::buildObjectForRegionHighlight):
+ * rendering/FloatingObjects.cpp:
+ (WebCore::ComputeFloatOffsetForFloatLayoutAdapter<FloatTypeValue>::heightRemaining):
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::layoutShapeInsideInfo):
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::collapseMargins):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::mainAxisContentExtent):
+ (WebCore::RenderFlexibleBox::preferredMainAxisContentExtentForChild):
+ (WebCore::RenderFlexibleBox::alignChildren):
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::addForcedRegionBreak):
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::heightAdjustedForSetOffset):
+ (WebCore::RenderMultiColumnSet::calculateBalancedHeight):
+
</ins><span class="cx"> 2014-01-24 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Prepare scrolling tree to handle > 1 scrolling node
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorOverlaycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorOverlay.cpp (162736 => 162737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-01-25 00:04:18 UTC (rev 162736)
+++ trunk/Source/WebCore/inspector/InspectorOverlay.cpp 2014-01-25 00:21:59 UTC (rev 162737)
</span><span class="lines">@@ -406,7 +406,7 @@
</span><span class="cx">
</span><span class="cx"> // Move the link boxes slightly inside the region border box.
</span><span class="cx"> LayoutUnit maxUsableHeight = std::max(LayoutUnit(), borderBox.height() - linkBoxMidpoint.height());
</span><del>- LayoutUnit linkBoxVerticalOffset = std::min(LayoutUnit(15), maxUsableHeight);
</del><ins>+ LayoutUnit linkBoxVerticalOffset = std::min(LayoutUnit::fromPixel(15), maxUsableHeight);
</ins><span class="cx"> incomingRectBox.move(0, linkBoxVerticalOffset);
</span><span class="cx"> outgoingRectBox.move(0, -linkBoxVerticalOffset);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingFloatingObjectscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/FloatingObjects.cpp (162736 => 162737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/FloatingObjects.cpp 2014-01-25 00:04:18 UTC (rev 162736)
+++ trunk/Source/WebCore/rendering/FloatingObjects.cpp 2014-01-25 00:21:59 UTC (rev 162737)
</span><span class="lines">@@ -450,7 +450,7 @@
</span><span class="cx"> template <FloatingObject::Type FloatTypeValue>
</span><span class="cx"> LayoutUnit ComputeFloatOffsetForFloatLayoutAdapter<FloatTypeValue>::heightRemaining() const
</span><span class="cx"> {
</span><del>- return this->m_outermostFloat ? this->m_renderer.logicalBottomForFloat(this->m_outermostFloat) - this->m_lineTop : LayoutUnit(1);
</del><ins>+ return this->m_outermostFloat ? this->m_renderer.logicalBottomForFloat(this->m_outermostFloat) - this->m_lineTop : LayoutUnit::fromPixel(1);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <FloatingObject::Type FloatTypeValue>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (162736 => 162737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-01-25 00:04:18 UTC (rev 162736)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-01-25 00:21:59 UTC (rev 162737)
</span><span class="lines">@@ -1461,7 +1461,7 @@
</span><span class="cx"> if (!shapeInsideInfo && flowThreadContainingBlock() && allowsShapeInsideInfoSharing()) {
</span><span class="cx"> LayoutUnit lineHeight = this->lineHeight(false, isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
</span><span class="cx"> // regionAtBlockOffset returns regions like an array first={0,N-1}, second={N,M-1}, ...
</span><del>- LayoutUnit offset = logicalHeight() + lineHeight - LayoutUnit(1);
</del><ins>+ LayoutUnit offset = logicalHeight() + lineHeight - LayoutUnit::fromPixel(1);
</ins><span class="cx"> RenderRegion* region = regionAtBlockOffset(offset);
</span><span class="cx"> if (region && region->logicalHeight())
</span><span class="cx"> shapeInsideInfo = region->shapeInsideInfo();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (162736 => 162737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-01-25 00:04:18 UTC (rev 162736)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-01-25 00:21:59 UTC (rev 162737)
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> // If we are at the before side of the block and we collapse, ignore the computed margin
</span><span class="cx"> // and just add the child margin to the container height. This will correctly position
</span><span class="cx"> // the child inside the container.
</span><del>- LayoutUnit separateMargin = !marginInfo.canCollapseWithMarginBefore() ? marginInfo.margin() : LayoutUnit(0);
</del><ins>+ LayoutUnit separateMargin = !marginInfo.canCollapseWithMarginBefore() ? marginInfo.margin() : LayoutUnit::fromPixel(0);
</ins><span class="cx"> setLogicalHeight(logicalHeight() + separateMargin + marginBeforeForChild(child));
</span><span class="cx"> logicalTop = logicalHeight();
</span><span class="cx"> } else if (!marginInfo.discardMargin() && (!marginInfo.atBeforeSideOfBlock()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (162736 => 162737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2014-01-25 00:04:18 UTC (rev 162736)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2014-01-25 00:21:59 UTC (rev 162737)
</span><span class="lines">@@ -457,7 +457,7 @@
</span><span class="cx"> computeLogicalHeight(borderBoxLogicalHeight, logicalTop(), computedValues);
</span><span class="cx"> if (computedValues.m_extent == LayoutUnit::max())
</span><span class="cx"> return computedValues.m_extent;
</span><del>- return std::max(LayoutUnit(0), computedValues.m_extent - borderPaddingAndScrollbar);
</del><ins>+ return std::max(LayoutUnit::fromPixel(0), computedValues.m_extent - borderPaddingAndScrollbar);
</ins><span class="cx"> }
</span><span class="cx"> return contentLogicalWidth();
</span><span class="cx"> }
</span><span class="lines">@@ -682,7 +682,7 @@
</span><span class="cx"> ASSERT(mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child) >= 0);
</span><span class="cx"> return mainAxisExtent - mainAxisBorderAndPaddingExtentForChild(child);
</span><span class="cx"> }
</span><del>- return std::max(LayoutUnit(0), computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis));
</del><ins>+ return std::max(LayoutUnit::fromPixel(0), computeMainAxisExtentForChild(child, MainOrPreferredSize, flexBasis));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderFlexibleBox::layoutFlexItems(bool relayoutChildren, Vector<LineContext>& lineContexts)
</span><span class="lines">@@ -1269,7 +1269,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (updateAutoMarginsInCrossAxis(*child, std::max(LayoutUnit(0), availableAlignmentSpaceForChild(lineCrossAxisExtent, *child))))
</del><ins>+ if (updateAutoMarginsInCrossAxis(*child, std::max(LayoutUnit::fromPixel(0), availableAlignmentSpaceForChild(lineCrossAxisExtent, *child))))
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> switch (alignmentForChild(*child)) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (162736 => 162737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-01-25 00:04:18 UTC (rev 162736)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-01-25 00:21:59 UTC (rev 162737)
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> if (RenderMultiColumnSet* multicolSet = toRenderMultiColumnSet(regionAtBlockOffset(block, offset))) {
</span><span class="cx"> multicolSet->addForcedBreak(offset);
</span><span class="cx"> if (offsetBreakAdjustment)
</span><del>- *offsetBreakAdjustment = pageLogicalHeightForOffset(offset) ? pageRemainingLogicalHeightForOffset(offset, IncludePageBoundary) : LayoutUnit(0);
</del><ins>+ *offsetBreakAdjustment = pageLogicalHeightForOffset(offset) ? pageRemainingLogicalHeightForOffset(offset, IncludePageBoundary) : LayoutUnit::fromPixel(0);
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx"> return false;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (162736 => 162737)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-01-25 00:04:18 UTC (rev 162736)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-01-25 00:21:59 UTC (rev 162737)
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> LayoutUnit contentLogicalTop = logicalTop() - multicolBlock->borderAndPaddingBefore();
</span><span class="cx">
</span><span class="cx"> height -= contentLogicalTop;
</span><del>- return std::max(height, LayoutUnit(1)); // Let's avoid zero height, as that would probably cause an infinite amount of columns to be created.
</del><ins>+ return std::max(height, LayoutUnit::fromPixel(1)); // Let's avoid zero height, as that would probably cause an infinite amount of columns to be created.
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderMultiColumnSet::pageLogicalTopForOffset(LayoutUnit offset) const
</span><span class="lines">@@ -118,7 +118,7 @@
</span><span class="cx"> if (initial) {
</span><span class="cx"> // Start with the lowest imaginable column height.
</span><span class="cx"> unsigned index = findRunWithTallestColumns();
</span><del>- LayoutUnit startOffset = index > 0 ? m_contentRuns[index - 1].breakOffset() : LayoutUnit(0);
</del><ins>+ LayoutUnit startOffset = index > 0 ? m_contentRuns[index - 1].breakOffset() : LayoutUnit::fromPixel(0);
</ins><span class="cx"> return std::max<LayoutUnit>(m_contentRuns[index].columnLogicalHeight(startOffset), m_minimumColumnHeight);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>