<!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>[178193] 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/178193">178193</a></dd>
<dt>Author</dt> <dd>bjonesbe@adobe.com</dd>
<dt>Date</dt> <dd>2015-01-09 13:25:08 -0800 (Fri, 09 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify LineWidth::wrapNextToShapeOutside()
https://bugs.webkit.org/show_bug.cgi?id=140304
Reviewed by Zoltan Horvath.
This function used to manually check to see if the entire height of
the line would have enough space next to the float. However, the code
to compute the offsets will do this automatically (and probably a lot
faster), if the line height is passed in. This patch does just that.
No new tests, no behavior change.
* rendering/line/LineWidth.cpp:
(WebCore::availableWidthAtOffset): Remove now unused override, allow
passing in lineHeight.
(WebCore::LineWidth::wrapNextToShapeOutside): Pass the lineHeight
when computing the available width, so we don't need to check
isWholeLineFit anymore.
(WebCore::isWholeLineFit): Deleted.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (178192 => 178193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-09 21:01:53 UTC (rev 178192)
+++ trunk/Source/WebCore/ChangeLog 2015-01-09 21:25:08 UTC (rev 178193)
</span><span class="lines">@@ -1,5 +1,27 @@
</span><span class="cx"> 2015-01-09 Bem Jones-Bey <bjonesbe@adobe.com>
</span><span class="cx">
</span><ins>+ Simplify LineWidth::wrapNextToShapeOutside()
+ https://bugs.webkit.org/show_bug.cgi?id=140304
+
+ Reviewed by Zoltan Horvath.
+
+ This function used to manually check to see if the entire height of
+ the line would have enough space next to the float. However, the code
+ to compute the offsets will do this automatically (and probably a lot
+ faster), if the line height is passed in. This patch does just that.
+
+ No new tests, no behavior change.
+
+ * rendering/line/LineWidth.cpp:
+ (WebCore::availableWidthAtOffset): Remove now unused override, allow
+ passing in lineHeight.
+ (WebCore::LineWidth::wrapNextToShapeOutside): Pass the lineHeight
+ when computing the available width, so we don't need to check
+ isWholeLineFit anymore.
+ (WebCore::isWholeLineFit): Deleted.
+
+2015-01-09 Bem Jones-Bey <bjonesbe@adobe.com>
+
</ins><span class="cx"> [CSS Shapes] content inside second shape area when two floats interact
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=137702
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (178192 => 178193)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2015-01-09 21:01:53 UTC (rev 178192)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2015-01-09 21:25:08 UTC (rev 178193)
</span><span class="lines">@@ -141,20 +141,13 @@
</span><span class="cx"> m_overhangWidth += startOverhang + endOverhang;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText, float& newLineLeft, float& newLineRight)
</del><ins>+inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText, float& newLineLeft, float& newLineRight, const LayoutUnit& lineHeight = 0)
</ins><span class="cx"> {
</span><del>- newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText);
- newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText);
</del><ins>+ newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText, lineHeight);
+ newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText, lineHeight);
</ins><span class="cx"> return std::max(0.0f, newLineRight - newLineLeft);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline static float availableWidthAtOffset(const RenderBlockFlow& block, const LayoutUnit& offset, bool shouldIndentText)
-{
- float newLineLeft = 0;
- float newLineRight = 0;
- return availableWidthAtOffset(block, offset, shouldIndentText, newLineLeft, newLineRight);
-}
-
</del><span class="cx"> void LineWidth::updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, float newLineLeft, float newLineRight)
</span><span class="cx"> {
</span><span class="cx"> if (newLineWidth <= m_availableWidth)
</span><span class="lines">@@ -167,16 +160,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><del>-inline static bool isWholeLineFit(const RenderBlockFlow& block, const LayoutUnit& lineTop, LayoutUnit lineHeight, float uncommittedWidth, bool shouldIndentText)
-{
- for (LayoutUnit lineBottom = lineTop; lineBottom <= lineTop + lineHeight; ++lineBottom) {
- LayoutUnit availableWidthAtBottom = availableWidthAtOffset(block, lineBottom, shouldIndentText);
- if (availableWidthAtBottom < uncommittedWidth)
- return false;
- }
- return true;
-}
-
</del><span class="cx"> void LineWidth::wrapNextToShapeOutside(bool isFirstLine)
</span><span class="cx"> {
</span><span class="cx"> LayoutUnit lineHeight = m_block.lineHeight(isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
</span><span class="lines">@@ -188,8 +171,8 @@
</span><span class="cx"> float newLineLeft = m_left;
</span><span class="cx"> float newLineRight = m_right;
</span><span class="cx"> while (true) {
</span><del>- newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText(), newLineLeft, newLineRight);
- if (newLineWidth >= m_uncommittedWidth && isWholeLineFit(m_block, newLineTop, lineHeight, m_uncommittedWidth, shouldIndentText()))
</del><ins>+ newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText(), newLineLeft, newLineRight, lineHeight);
+ if (newLineWidth >= m_uncommittedWidth)
</ins><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> if (newLineTop >= floatLogicalBottom)
</span></span></pre>
</div>
</div>
</body>
</html>