<!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>[173134] 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/173134">173134</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2014-08-29 19:55:02 -0700 (Fri, 29 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rename updatePreferredWidth to make it more explicit.
https://bugs.webkit.org/show_bug.cgi?id=136389
Reviewed by Simon Fraser.
No change in functionality.
* rendering/RenderBlock.cpp:
(WebCore::preferredWidth):
(WebCore::RenderBlock::computeInlinePreferredLogicalWidths):
(WebCore::updatePreferredWidth): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173133 => 173134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-30 01:33:24 UTC (rev 173133)
+++ trunk/Source/WebCore/ChangeLog        2014-08-30 02:55:02 UTC (rev 173134)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-29 Zalan Bujtas <zalan@apple.com>
+
+ Rename updatePreferredWidth to make it more explicit.
+ https://bugs.webkit.org/show_bug.cgi?id=136389
+
+ Reviewed by Simon Fraser.
+
+ No change in functionality.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::preferredWidth):
+ (WebCore::RenderBlock::computeInlinePreferredLogicalWidths):
+ (WebCore::updatePreferredWidth): Deleted.
+
</ins><span class="cx"> 2014-08-29 Gavin Barraclough <barraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> Make timerNestingLevel threadsafe
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (173133 => 173134)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp        2014-08-30 01:33:24 UTC (rev 173133)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp        2014-08-30 02:55:02 UTC (rev 173134)
</span><span class="lines">@@ -2897,9 +2897,9 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static inline void updatePreferredWidth(LayoutUnit& preferredWidth, float& result)
</del><ins>+static inline LayoutUnit preferredWidth(LayoutUnit preferredWidth, float result)
</ins><span class="cx"> {
</span><del>- preferredWidth = std::max(LayoutUnit::fromFloatCeil(result), preferredWidth);
</del><ins>+ return std::max(preferredWidth, LayoutUnit::fromFloatCeil(result));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::computeInlinePreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth)
</span><span class="lines">@@ -2981,7 +2981,7 @@
</span><span class="cx">
</span><span class="cx"> if (!child->isText()) {
</span><span class="cx"> if (child->isLineBreakOpportunity()) {
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</ins><span class="cx"> inlineMin = 0;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -3029,13 +3029,13 @@
</span><span class="cx">
</span><span class="cx"> bool canBreakReplacedElement = !child->isImage() || allowImagesToBreak;
</span><span class="cx"> if ((canBreakReplacedElement && (autoWrap || oldAutoWrap) && (!isPrevChildInlineFlow || shouldBreakLineAfterText)) || clearPreviousFloat) {
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</ins><span class="cx"> inlineMin = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If we're supposed to clear the previous float, then terminate maxwidth as well.
</span><span class="cx"> if (clearPreviousFloat) {
</span><del>- updatePreferredWidth(maxLogicalWidth, inlineMax);
</del><ins>+ maxLogicalWidth = preferredWidth(maxLogicalWidth, inlineMax);
</ins><span class="cx"> inlineMax = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3056,19 +3056,19 @@
</span><span class="cx">
</span><span class="cx"> if (!autoWrap || !canBreakReplacedElement || (isPrevChildInlineFlow && !shouldBreakLineAfterText)) {
</span><span class="cx"> if (child->isFloating())
</span><del>- updatePreferredWidth(minLogicalWidth, childMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, childMin);
</ins><span class="cx"> else
</span><span class="cx"> inlineMin += childMin;
</span><span class="cx"> } else {
</span><span class="cx"> // Now check our line.
</span><del>- updatePreferredWidth(minLogicalWidth, childMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, childMin);
</ins><span class="cx">
</span><span class="cx"> // Now start a new line.
</span><span class="cx"> inlineMin = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (autoWrap && canBreakReplacedElement && isPrevChildInlineFlow) {
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</ins><span class="cx"> inlineMin = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3101,7 +3101,7 @@
</span><span class="cx"> // This text object will not be rendered, but it may still provide a breaking opportunity.
</span><span class="cx"> if (!hasBreak && childMax == 0) {
</span><span class="cx"> if (autoWrap && (beginWS || endWS)) {
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</ins><span class="cx"> inlineMin = 0;
</span><span class="cx"> }
</span><span class="cx"> continue;
</span><span class="lines">@@ -3144,10 +3144,10 @@
</span><span class="cx"> // we start and end with whitespace.
</span><span class="cx"> if (beginWS)
</span><span class="cx"> // Go ahead and end the current line.
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</ins><span class="cx"> else {
</span><span class="cx"> inlineMin += beginMin;
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</ins><span class="cx"> childMin -= ti;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3156,11 +3156,11 @@
</span><span class="cx"> if (endWS) {
</span><span class="cx"> // We end in whitespace, which means we can go ahead
</span><span class="cx"> // and end our current line.
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</ins><span class="cx"> inlineMin = 0;
</span><span class="cx"> shouldBreakLineAfterText = false;
</span><span class="cx"> } else {
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
</ins><span class="cx"> inlineMin = endMin;
</span><span class="cx"> shouldBreakLineAfterText = true;
</span><span class="cx"> }
</span><span class="lines">@@ -3168,8 +3168,8 @@
</span><span class="cx">
</span><span class="cx"> if (hasBreak) {
</span><span class="cx"> inlineMax += beginMax;
</span><del>- updatePreferredWidth(maxLogicalWidth, inlineMax);
- updatePreferredWidth(maxLogicalWidth, childMax);
</del><ins>+ maxLogicalWidth = preferredWidth(maxLogicalWidth, inlineMax);
+ maxLogicalWidth = preferredWidth(maxLogicalWidth, childMax);
</ins><span class="cx"> inlineMax = endMax;
</span><span class="cx"> addedTextIndent = true;
</span><span class="cx"> } else
</span><span class="lines">@@ -3180,8 +3180,8 @@
</span><span class="cx"> if (child->isListMarker())
</span><span class="cx"> stripFrontSpaces = true;
</span><span class="cx"> } else {
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
- updatePreferredWidth(maxLogicalWidth, inlineMax);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
+ maxLogicalWidth = preferredWidth(maxLogicalWidth, inlineMax);
</ins><span class="cx"> inlineMin = inlineMax = 0;
</span><span class="cx"> stripFrontSpaces = true;
</span><span class="cx"> trailingSpaceChild = 0;
</span><span class="lines">@@ -3199,8 +3199,8 @@
</span><span class="cx"> if (styleToUse.collapseWhiteSpace())
</span><span class="cx"> stripTrailingSpace(inlineMax, inlineMin, trailingSpaceChild);
</span><span class="cx">
</span><del>- updatePreferredWidth(minLogicalWidth, inlineMin);
- updatePreferredWidth(maxLogicalWidth, inlineMax);
</del><ins>+ minLogicalWidth = preferredWidth(minLogicalWidth, inlineMin);
+ maxLogicalWidth = preferredWidth(maxLogicalWidth, inlineMax);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlock::computeBlockPreferredLogicalWidths(LayoutUnit& minLogicalWidth, LayoutUnit& maxLogicalWidth) const
</span></span></pre>
</div>
</div>
</body>
</html>