<!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>[172970] 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/172970">172970</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-08-26 12:29:09 -0700 (Tue, 26 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Subpixel layout: Remove float to LayoutUnit ceil/round function wrappers.
https://bugs.webkit.org/show_bug.cgi?id=136253
Reviewed by Simon Fraser.
These functions wrap LayoutUnit::fromFloatCeil/fromFloatRound() functions to ceil/round float to LayoutUnit.
Their usage is limited and can easily be confused with the snapping functions (snap to css/device pixels).
No change in functionality.
* platform/LayoutUnit.h:
(WebCore::roundedLayoutUnit): Deleted. : Callers use the more explicit LayoutUnit::fromFloatRound() function.
(WebCore::ceiledLayoutUnit): Deleted. : Callers use the more explicit LayoutUnit::fromFloatCeil() function.
* rendering/RenderBlock.cpp:
(WebCore::updatePreferredWidth):
(WebCore::RenderBlock::computeInlinePreferredLogicalWidths):
(WebCore::adjustFloatForSubPixelLayout): Deleted.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::positionLineBox):
* rendering/RenderFlexibleBox.cpp:
(WebCore::RenderFlexibleBox::resolveFlexibleLengths):
* rendering/RenderInline.cpp:
(WebCore::RenderInline::offsetForInFlowPositionedInline):
* rendering/RenderTextControlSingleLine.cpp:
(WebCore::RenderTextControlSingleLine::preferredContentLogicalWidth):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformLayoutUnith">trunk/Source/WebCore/platform/LayoutUnit.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlexibleBoxcpp">trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderInlinecpp">trunk/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextControlSingleLinecpp">trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172969 => 172970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-26 19:00:29 UTC (rev 172969)
+++ trunk/Source/WebCore/ChangeLog 2014-08-26 19:29:09 UTC (rev 172970)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2014-08-26 Zalan Bujtas <zalan@apple.com>
+
+ Subpixel layout: Remove float to LayoutUnit ceil/round function wrappers.
+ https://bugs.webkit.org/show_bug.cgi?id=136253
+
+ Reviewed by Simon Fraser.
+
+ These functions wrap LayoutUnit::fromFloatCeil/fromFloatRound() functions to ceil/round float to LayoutUnit.
+ Their usage is limited and can easily be confused with the snapping functions (snap to css/device pixels).
+
+ No change in functionality.
+
+ * platform/LayoutUnit.h:
+ (WebCore::roundedLayoutUnit): Deleted. : Callers use the more explicit LayoutUnit::fromFloatRound() function.
+ (WebCore::ceiledLayoutUnit): Deleted. : Callers use the more explicit LayoutUnit::fromFloatCeil() function.
+ * rendering/RenderBlock.cpp:
+ (WebCore::updatePreferredWidth):
+ (WebCore::RenderBlock::computeInlinePreferredLogicalWidths):
+ (WebCore::adjustFloatForSubPixelLayout): Deleted.
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::positionLineBox):
+ * rendering/RenderFlexibleBox.cpp:
+ (WebCore::RenderFlexibleBox::resolveFlexibleLengths):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::offsetForInFlowPositionedInline):
+ * rendering/RenderTextControlSingleLine.cpp:
+ (WebCore::RenderTextControlSingleLine::preferredContentLogicalWidth):
+
</ins><span class="cx"> 2014-08-26 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Ensure that layout is up-to-date before hit testing
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLayoutUnith"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LayoutUnit.h (172969 => 172970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LayoutUnit.h 2014-08-26 19:00:29 UTC (rev 172969)
+++ trunk/Source/WebCore/platform/LayoutUnit.h 2014-08-26 19:29:09 UTC (rev 172970)
</span><span class="lines">@@ -912,16 +912,6 @@
</span><span class="cx"> return roundToDevicePixel(fraction + size, pixelSnappingFactor) - roundToDevicePixel(fraction, pixelSnappingFactor);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline LayoutUnit roundedLayoutUnit(float value)
-{
- return LayoutUnit::fromFloatRound(value);
-}
-
-inline LayoutUnit ceiledLayoutUnit(float value)
-{
- return LayoutUnit::fromFloatCeil(value);
-}
-
</del><span class="cx"> inline LayoutUnit absoluteValue(const LayoutUnit& value)
</span><span class="cx"> {
</span><span class="cx"> return value.abs();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (172969 => 172970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-08-26 19:00:29 UTC (rev 172969)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2014-08-26 19:29:09 UTC (rev 172970)
</span><span class="lines">@@ -2899,25 +2899,9 @@
</span><span class="cx">
</span><span class="cx"> static inline void updatePreferredWidth(LayoutUnit& preferredWidth, float& result)
</span><span class="cx"> {
</span><del>- LayoutUnit snappedResult = ceiledLayoutUnit(result);
- preferredWidth = std::max(snappedResult, preferredWidth);
</del><ins>+ preferredWidth = std::max(LayoutUnit::fromFloatCeil(result), preferredWidth);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-// With sub-pixel enabled: When converting between floating point and LayoutUnits
-// we risk losing precision with each conversion. When this occurs while
-// accumulating our preferred widths, we can wind up with a line width that's
-// larger than our maxPreferredWidth due to pure float accumulation.
-//
-// With sub-pixel disabled: values from Lengths or the render tree aren't subject
-// to the same loss of precision, as they're always truncated and stored as
-// integers. We mirror that behavior here to prevent over-allocating our preferred
-// width.
-static inline LayoutUnit adjustFloatForSubPixelLayout(float value)
-{
- return ceiledLayoutUnit(value);
-}
-
-
</del><span class="cx"> void RenderBlock::computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth)
</span><span class="cx"> {
</span><span class="cx"> float inlineMax = 0;
</span><span class="lines">@@ -3019,9 +3003,9 @@
</span><span class="cx"> Length startMargin = childStyle.marginStart();
</span><span class="cx"> Length endMargin = childStyle.marginEnd();
</span><span class="cx"> if (startMargin.isFixed())
</span><del>- margins += adjustFloatForSubPixelLayout(startMargin.value());
</del><ins>+ margins += LayoutUnit::fromFloatCeil(startMargin.value());
</ins><span class="cx"> if (endMargin.isFixed())
</span><del>- margins += adjustFloatForSubPixelLayout(endMargin.value());
</del><ins>+ margins += LayoutUnit::fromFloatCeil(endMargin.value());
</ins><span class="cx"> childMin += margins.ceilToFloat();
</span><span class="cx"> childMax += margins.ceilToFloat();
</span><span class="cx"> }
</span><span class="lines">@@ -3062,7 +3046,7 @@
</span><span class="cx"> childMax += ceiledIndent;
</span><span class="cx">
</span><span class="cx"> if (childMin < 0)
</span><del>- textIndent = adjustFloatForSubPixelLayout(childMin);
</del><ins>+ textIndent = LayoutUnit::fromFloatCeil(childMin);
</ins><span class="cx"> else
</span><span class="cx"> addedTextIndent = true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (172969 => 172970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-08-26 19:00:29 UTC (rev 172969)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-08-26 19:29:09 UTC (rev 172970)
</span><span class="lines">@@ -2031,7 +2031,7 @@
</span><span class="cx"> // our object was inline originally, since otherwise it would have ended up underneath
</span><span class="cx"> // the inlines.
</span><span class="cx"> RootInlineBox& rootBox = box.root();
</span><del>- rootBox.blockFlow().setStaticInlinePositionForChild(*this, rootBox.lineTopWithLeading(), roundedLayoutUnit(box.logicalLeft()));
</del><ins>+ rootBox.blockFlow().setStaticInlinePositionForChild(*this, rootBox.lineTopWithLeading(), LayoutUnit::fromFloatRound(box.logicalLeft()));
</ins><span class="cx"> if (style().hasStaticInlinePosition(box.isHorizontal()))
</span><span class="cx"> setChildNeedsLayout(MarkOnlyThis); // Just go ahead and mark the positioned object as needing layout, so it will update its position properly.
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlexibleBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp (172969 => 172970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2014-08-26 19:00:29 UTC (rev 172969)
+++ trunk/Source/WebCore/rendering/RenderFlexibleBox.cpp 2014-08-26 19:29:09 UTC (rev 172970)
</span><span class="lines">@@ -948,7 +948,7 @@
</span><span class="cx"> else if (availableFreeSpace < 0 && totalWeightedFlexShrink > 0 && flexSign == NegativeFlexibility && std::isfinite(totalWeightedFlexShrink))
</span><span class="cx"> extraSpace = availableFreeSpace * child.style().flexShrink() * preferredChildSize / totalWeightedFlexShrink;
</span><span class="cx"> if (std::isfinite(extraSpace))
</span><del>- childSize += roundedLayoutUnit(extraSpace);
</del><ins>+ childSize += LayoutUnit::fromFloatRound(extraSpace);
</ins><span class="cx">
</span><span class="cx"> LayoutUnit adjustedChildSize = adjustChildSizeForMinAndMax(child, childSize);
</span><span class="cx"> childSizes.append(adjustedChildSize);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (172969 => 172970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderInline.cpp 2014-08-26 19:00:29 UTC (rev 172969)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2014-08-26 19:29:09 UTC (rev 172970)
</span><span class="lines">@@ -1425,7 +1425,7 @@
</span><span class="cx"> LayoutUnit inlinePosition;
</span><span class="cx"> LayoutUnit blockPosition;
</span><span class="cx"> if (firstLineBox()) {
</span><del>- inlinePosition = roundedLayoutUnit(firstLineBox()->logicalLeft());
</del><ins>+ inlinePosition = LayoutUnit::fromFloatRound(firstLineBox()->logicalLeft());
</ins><span class="cx"> blockPosition = firstLineBox()->logicalTop();
</span><span class="cx"> } else {
</span><span class="cx"> inlinePosition = layer()->staticInlinePosition();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextControlSingleLinecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (172969 => 172970)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-08-26 19:00:29 UTC (rev 172969)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp 2014-08-26 19:29:09 UTC (rev 172970)
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> if (factor <= 0)
</span><span class="cx"> factor = 20;
</span><span class="cx">
</span><del>- LayoutUnit result = ceiledLayoutUnit(charWidth * factor);
</del><ins>+ LayoutUnit result = LayoutUnit::fromFloatCeil(charWidth * factor);
</ins><span class="cx">
</span><span class="cx"> float maxCharWidth = 0.f;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>