<!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>[164834] 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/164834">164834</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-27 15:24:05 -0800 (Thu, 27 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid calling logicalLeftOffsetForLine 2 times in LineWidth::fitBelowFloats
https://bugs.webkit.org/show_bug.cgi?id=129433
Reviewed by Darin Adler.
This change updates fitBelowFloats and its helpers to call RenderBlock::logicalLeftOffsetForLine only once.
No new tests, no behavior change.
* rendering/line/LineWidth.cpp:
(WebCore::availableWidthAtOffset):
(WebCore::LineWidth::updateLineDimension):
(WebCore::LineWidth::wrapNextToShapeOutside):
(WebCore::LineWidth::fitBelowFloats):
* rendering/line/LineWidth.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthcpp">trunk/Source/WebCore/rendering/line/LineWidth.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderinglineLineWidthh">trunk/Source/WebCore/rendering/line/LineWidth.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164833 => 164834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-27 23:18:26 UTC (rev 164833)
+++ trunk/Source/WebCore/ChangeLog 2014-02-27 23:24:05 UTC (rev 164834)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-02-27 Zoltan Horvath <zoltan@webkit.org>
+
+ Avoid calling logicalLeftOffsetForLine 2 times in LineWidth::fitBelowFloats
+ https://bugs.webkit.org/show_bug.cgi?id=129433
+
+ Reviewed by Darin Adler.
+
+ This change updates fitBelowFloats and its helpers to call RenderBlock::logicalLeftOffsetForLine only once.
+
+ No new tests, no behavior change.
+
+ * rendering/line/LineWidth.cpp:
+ (WebCore::availableWidthAtOffset):
+ (WebCore::LineWidth::updateLineDimension):
+ (WebCore::LineWidth::wrapNextToShapeOutside):
+ (WebCore::LineWidth::fitBelowFloats):
+ * rendering/line/LineWidth.h:
+
</ins><span class="cx"> 2014-02-27 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Micro-optimize elementAffectsDirectionality().
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (164833 => 164834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-02-27 23:18:26 UTC (rev 164833)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-02-27 23:24:05 UTC (rev 164834)
</span><span class="lines">@@ -158,26 +158,33 @@
</span><span class="cx"> m_overhangWidth += startOverhang + endOverhang;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline static float availableWidthAtOffset(const RenderBlock& block, const LayoutUnit& offset, bool shouldIndentText)
</del><ins>+inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText, float& newLineLeft, float& newLineRight)
</ins><span class="cx"> {
</span><del>- float newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText);
- float newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText);
</del><ins>+ newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText);
+ newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText);
</ins><span class="cx"> return std::max(0.0f, newLineRight - newLineLeft);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LineWidth::updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth)
</del><ins>+inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText)
</ins><span class="cx"> {
</span><ins>+ float newLineLeft = 0;
+ float newLineRight = 0;
+ return availableWidthAtOffset(block, offset, shouldIndentText, newLineLeft, newLineRight);
+}
+
+void LineWidth::updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, float newLineLeft, float newLineRight)
+{
</ins><span class="cx"> if (newLineWidth <= m_availableWidth)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_block.setLogicalHeight(newLineTop);
</span><span class="cx"> m_availableWidth = newLineWidth + m_overhangWidth;
</span><del>- m_left = m_block.logicalLeftOffsetForLine(newLineTop, shouldIndentText());
- m_right = m_block.logicalRightOffsetForLine(newLineTop, shouldIndentText());
</del><ins>+ m_left = newLineLeft;
+ m_right = newLineRight;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>-inline static bool isWholeLineFit(const RenderBlock& block, const LayoutUnit& lineTop, LayoutUnit lineHeight, float uncommittedWidth, bool shouldIndentText)
</del><ins>+inline static bool isWholeLineFit(const RenderBlockFlow& block, const LayoutUnit& lineTop, LayoutUnit lineHeight, float uncommittedWidth, bool shouldIndentText)
</ins><span class="cx"> {
</span><span class="cx"> for (LayoutUnit lineBottom = lineTop; lineBottom <= lineTop + lineHeight; ++lineBottom) {
</span><span class="cx"> LayoutUnit availableWidthAtBottom = availableWidthAtOffset(block, lineBottom, shouldIndentText);
</span><span class="lines">@@ -195,8 +202,10 @@
</span><span class="cx"> LayoutUnit floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lineLogicalTop);
</span><span class="cx">
</span><span class="cx"> float newLineWidth;
</span><ins>+ float newLineLeft = m_left;
+ float newLineRight = m_right;
</ins><span class="cx"> while (true) {
</span><del>- newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText());
</del><ins>+ newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText(), newLineLeft, newLineRight);
</ins><span class="cx"> if (newLineWidth >= m_uncommittedWidth && isWholeLineFit(m_block, newLineTop, lineHeight, m_uncommittedWidth, shouldIndentText()))
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="lines">@@ -205,7 +214,7 @@
</span><span class="cx">
</span><span class="cx"> ++newLineTop;
</span><span class="cx"> }
</span><del>- updateLineDimension(newLineTop, newLineWidth);
</del><ins>+ updateLineDimension(newLineTop, newLineWidth, newLineLeft, newLineRight);
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -221,6 +230,8 @@
</span><span class="cx"> LayoutUnit floatLogicalBottom;
</span><span class="cx"> LayoutUnit lastFloatLogicalBottom = m_block.logicalHeight();
</span><span class="cx"> float newLineWidth = m_availableWidth;
</span><ins>+ float newLineLeft = m_left;
+ float newLineRight = m_right;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> FloatingObject* lastFloatFromPreviousLine = (m_block.containsFloats() ? m_block.m_floatingObjects->set().last().get() : 0);
</span><span class="lines">@@ -233,7 +244,7 @@
</span><span class="cx"> if (floatLogicalBottom <= lastFloatLogicalBottom)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- newLineWidth = availableWidthAtOffset(m_block, floatLogicalBottom, shouldIndentText());
</del><ins>+ newLineWidth = availableWidthAtOffset(m_block, floatLogicalBottom, shouldIndentText(), newLineLeft, newLineRight);
</ins><span class="cx"> lastFloatLogicalBottom = floatLogicalBottom;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</span><span class="lines">@@ -250,7 +261,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateLineDimension(lastFloatLogicalBottom, newLineWidth);
</del><ins>+ updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLineRight);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LineWidth::setTrailingWhitespaceWidth(float collapsedWhitespace, float borderPaddingMargin)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.h (164833 => 164834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.h 2014-02-27 23:18:26 UTC (rev 164833)
+++ trunk/Source/WebCore/rendering/line/LineWidth.h 2014-02-27 23:24:05 UTC (rev 164834)
</span><span class="lines">@@ -76,7 +76,7 @@
</span><span class="cx"> private:
</span><span class="cx"> void computeAvailableWidthFromLeftAndRight();
</span><span class="cx"> bool fitsOnLineExcludingTrailingCollapsedWhitespace() const;
</span><del>- void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth);
</del><ins>+ void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, float newLineLeft, float newLineRight);
</ins><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> void wrapNextToShapeOutside(bool isFirstLine);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>