<!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>[164613] trunk</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/164613">164613</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-24 15:10:32 -0800 (Mon, 24 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Adjust lineTop position to the next available wrapping location at shape-outsides
https://bugs.webkit.org/show_bug.cgi?id=128693
Reviewed by David Hyatt.
Source/WebCore:
When we don't have space next to the floating container, but we have space inside the floating-container next
to the defined shape-outside, we should wrap around the shape-outside. This patch fixes the behavior both for
cases when there is no space to fit at the first line, and for the additional lines cases.
Test: fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment.html
* rendering/line/BreakingContextInlineHeaders.h:
(WebCore::BreakingContext::handleText):
(WebCore::BreakingContext::commitAndUpdateLineBreakIfNeeded):
* rendering/line/LineWidth.cpp:
(WebCore::availableWidthAtOffset):
(WebCore::LineWidth::updateLineDimension): Added new helper.
(WebCore::isWholeLineFit): Added new helper.
(WebCore::LineWidth::wrapNextToShapeOutside): Added new helper.
(WebCore::LineWidth::fitBelowFloats): Add optional parameter for the function.
* rendering/line/LineWidth.h:
LayoutTests:
* fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment-expected.html: Added.
* fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh">trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatslinetopadjustmentexpectedhtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatslinetopadjustmenthtml">trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164612 => 164613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-24 22:57:33 UTC (rev 164612)
+++ trunk/LayoutTests/ChangeLog 2014-02-24 23:10:32 UTC (rev 164613)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-24 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Adjust lineTop position to the next available wrapping location at shape-outsides
+ https://bugs.webkit.org/show_bug.cgi?id=128693
+
+ Reviewed by David Hyatt.
+
+ * fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment-expected.html: Added.
+ * fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment.html: Added.
+
</ins><span class="cx"> 2014-02-24 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [CSS Grid Layout] handle undefined RemainingSpace in computeUsedBreadthOfGridTracks algorithm
</span></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatslinetopadjustmentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment-expected.html (0 => 164613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment-expected.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment-expected.html 2014-02-24 23:10:32 UTC (rev 164613)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<html>
+<head>
+<style>
+.overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 102px;
+ height: 106px;
+ background-color: green;
+}
+</style>
+</script>
+</head>
+<body>
+<div class="overlay"></div>
+<div class="overlay" style="left: 140px"></div>
+<div class="overlay" style="top: 140px"></div>
+<div class="overlay" style="top: 140px; left: 140px;"></div>
+
+<p style="margin-top: 280px;">The content should wrap around the triangle shapes, it should fit in the content box, so you should see four green rectangles.
+You shouldn't see any red.</p>
+<p><a href='http://webkit.org/b/127852'>Bug 128693</a>: [CSS Shapes] Adjust lineTop position to the next available wrapping location at shape-outsides</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastshapesshapeoutsidefloatsshapeoutsidefloatslinetopadjustmenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment.html (0 => 164613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment.html (rev 0)
+++ trunk/LayoutTests/fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment.html 2014-02-24 23:10:32 UTC (rev 164613)
</span><span class="lines">@@ -0,0 +1,69 @@
</span><ins>+<html>
+<head>
+<style>
+.container {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 100px;
+ height: 100px;
+ font: 30px / 1 Ahem, sans-serif;
+ color: red;
+ border: 1px solid green;
+ border-top: 5px solid green;
+}
+.shape-outside {
+ width: 100px;
+ height: 100px;
+ background-color: rgba(15, 117, 117, 0.5);
+}
+.leftFloatTriangle {
+ -webkit-shape-outside: polygon(0px 0px, 100px 50px, 0px 100px);
+ float: left;
+}
+.rightFloatTriangle {
+ -webkit-shape-outside: polygon(100px 0px, 0px 50px, 100px 100px);
+ float: right;
+}
+.leftFloatUpperLeftTirangle {
+ -webkit-shape-outside: polygon(0px 0px, 100px 0px, 0px 100px);
+ float: left;
+}
+.rightFloatUpperRightTriangle {
+ -webkit-shape-outside: polygon(100px 0px, 0px 0px, 100px 100px);
+ float: right;
+}
+.overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ width: 102px;
+ height: 106px;
+ background-color: green;
+}
+</style>
+</script>
+</head>
+<body>
+<div class="container">
+ <div class="shape-outside leftFloatTriangle"></div> X X
+</div>
+<div class="container" style="left: 140px;">
+ <div class="shape-outside rightFloatTriangle"></div> X X
+</div>
+<div class="container" style="top: 140px;">
+ <div class="shape-outside leftFloatUpperLeftTirangle"></div> X X
+</div>
+<div class="container" style="top: 140px; left: 140px;">
+ <div class="shape-outside rightFloatUpperRightTriangle"></div> X X
+</div>
+<div class="overlay"></div>
+<div class="overlay" style="left: 140px"></div>
+<div class="overlay" style="top: 140px"></div>
+<div class="overlay" style="top: 140px; left: 140px;"></div>
+
+<p style="margin-top: 280px;">The content should wrap around the triangle shapes, it should fit in the content box, so you should see four green rectangles.
+You shouldn't see any red.</p>
+<p><a href='http://webkit.org/b/128693'>Bug 128693</a>: [CSS Shapes] Adjust lineTop position to the next available wrapping location at shape-outsides</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164612 => 164613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-24 22:57:33 UTC (rev 164612)
+++ trunk/Source/WebCore/ChangeLog 2014-02-24 23:10:32 UTC (rev 164613)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-02-24 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Adjust lineTop position to the next available wrapping location at shape-outsides
+ https://bugs.webkit.org/show_bug.cgi?id=128693
+
+ Reviewed by David Hyatt.
+
+ When we don't have space next to the floating container, but we have space inside the floating-container next
+ to the defined shape-outside, we should wrap around the shape-outside. This patch fixes the behavior both for
+ cases when there is no space to fit at the first line, and for the additional lines cases.
+
+ Test: fast/shapes/shape-outside-floats/shape-outside-floats-linetop-adjustment.html
+
+ * rendering/line/BreakingContextInlineHeaders.h:
+ (WebCore::BreakingContext::handleText):
+ (WebCore::BreakingContext::commitAndUpdateLineBreakIfNeeded):
+ * rendering/line/LineWidth.cpp:
+ (WebCore::availableWidthAtOffset):
+ (WebCore::LineWidth::updateLineDimension): Added new helper.
+ (WebCore::isWholeLineFit): Added new helper.
+ (WebCore::LineWidth::wrapNextToShapeOutside): Added new helper.
+ (WebCore::LineWidth::fitBelowFloats): Add optional parameter for the function.
+ * rendering/line/LineWidth.h:
+
</ins><span class="cx"> 2014-02-24 Martin Hock <mhock@apple.com>
</span><span class="cx">
</span><span class="cx"> Create SessionID value-style class for session IDs.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (164612 => 164613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-02-24 22:57:33 UTC (rev 164612)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-02-24 23:10:32 UTC (rev 164613)
</span><span class="lines">@@ -781,7 +781,7 @@
</span><span class="cx"> applyWordSpacing = wordSpacing && m_currentCharacterIsSpace;
</span><span class="cx">
</span><span class="cx"> if (!m_width.committedWidth() && m_autoWrap && !m_width.fitsOnLine())
</span><del>- m_width.fitBelowFloats();
</del><ins>+ m_width.fitBelowFloats(m_lineInfo.isFirstLine());
</ins><span class="cx">
</span><span class="cx"> if (m_autoWrap || breakWords) {
</span><span class="cx"> // If we break only after white-space, consider the current character
</span><span class="lines">@@ -1003,7 +1003,7 @@
</span><span class="cx">
</span><span class="cx"> // See if attempting to fit below floats creates more available width on the line.
</span><span class="cx"> if (!m_width.fitsOnLine() && !m_width.committedWidth())
</span><del>- m_width.fitBelowFloats();
</del><ins>+ m_width.fitBelowFloats(m_lineInfo.isFirstLine());
</ins><span class="cx">
</span><span class="cx"> bool canPlaceOnLine = m_width.fitsOnLine() || !m_autoWrapWasEverTrueOnLine;
</span><span class="cx">
</span><span class="lines">@@ -1027,7 +1027,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_width.fitBelowFloats();
</del><ins>+ m_width.fitBelowFloats(m_lineInfo.isFirstLine());
</ins><span class="cx">
</span><span class="cx"> // |width| may have been adjusted because we got shoved down past a float (thus
</span><span class="cx"> // giving us more room), so we need to retest, and only jump to
</span><span class="lines">@@ -1039,7 +1039,7 @@
</span><span class="cx"> } else if (m_blockStyle.autoWrap() && !m_width.fitsOnLine() && !m_width.committedWidth()) {
</span><span class="cx"> // If the container autowraps but the current child does not then we still need to ensure that it
</span><span class="cx"> // wraps and moves below any floats.
</span><del>- m_width.fitBelowFloats();
</del><ins>+ m_width.fitBelowFloats(m_lineInfo.isFirstLine());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_current.renderer()->isFloatingOrOutOfFlowPositioned()) {
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (164612 => 164613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-02-24 22:57:33 UTC (rev 164612)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-02-24 23:10:32 UTC (rev 164613)
</span><span class="lines">@@ -158,28 +158,85 @@
</span><span class="cx"> m_overhangWidth += startOverhang + endOverhang;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void LineWidth::fitBelowFloats()
</del><ins>+inline static float availableWidthAtOffset(const RenderBlock& block, const LayoutUnit& offset, bool shouldIndentText)
</ins><span class="cx"> {
</span><ins>+ float newLineLeft = block.logicalLeftOffsetForLine(offset, shouldIndentText);
+ float newLineRight = block.logicalRightOffsetForLine(offset, shouldIndentText);
+ return std::max(0.0f, newLineRight - newLineLeft);
+}
+
+void LineWidth::updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth)
+{
+ if (newLineWidth <= m_availableWidth)
+ return;
+
+ m_block.setLogicalHeight(newLineTop);
+ m_availableWidth = newLineWidth + m_overhangWidth;
+ m_left = m_block.logicalLeftOffsetForLine(newLineTop, shouldIndentText());
+ m_right = m_block.logicalRightOffsetForLine(newLineTop, shouldIndentText());
+}
+
+#if ENABLE(CSS_SHAPES)
+inline static bool isWholeLineFit(const RenderBlock& 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;
+}
+
+void LineWidth::wrapNextToShapeOutside(bool isFirstLine)
+{
+ LayoutUnit lineHeight = m_block.lineHeight(isFirstLine, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
+ LayoutUnit lineLogicalTop = m_block.logicalHeight();
+ LayoutUnit newLineTop = lineLogicalTop;
+ LayoutUnit floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lineLogicalTop);
+
+ float newLineWidth;
+ while (true) {
+ newLineWidth = availableWidthAtOffset(m_block, newLineTop, shouldIndentText());
+ if (newLineWidth >= m_uncommittedWidth && isWholeLineFit(m_block, newLineTop, lineHeight, m_uncommittedWidth, shouldIndentText()))
+ break;
+
+ if (newLineTop >= floatLogicalBottom)
+ break;
+
+ ++newLineTop;
+ }
+ updateLineDimension(newLineTop, newLineWidth);
+}
+#endif
+
+void LineWidth::fitBelowFloats(bool isFirstLine)
+{
+#if !ENABLE(CSS_SHAPES)
+ UNUSED_PARAM(isFirstLine);
+#endif
+
</ins><span class="cx"> ASSERT(!m_committedWidth);
</span><span class="cx"> ASSERT(!fitsOnLine());
</span><span class="cx">
</span><span class="cx"> LayoutUnit floatLogicalBottom;
</span><span class="cx"> LayoutUnit lastFloatLogicalBottom = m_block.logicalHeight();
</span><span class="cx"> float newLineWidth = m_availableWidth;
</span><del>- float newLineLeft = m_left;
- float newLineRight = m_right;
</del><ins>+
+#if ENABLE(CSS_SHAPES)
+ FloatingObject* lastFloatFromPreviousLine = (m_block.containsFloats() ? m_block.m_floatingObjects->set().last().get() : 0);
+ if (lastFloatFromPreviousLine && lastFloatFromPreviousLine->renderer().shapeOutsideInfo())
+ return wrapNextToShapeOutside(isFirstLine);
+#endif
+
</ins><span class="cx"> while (true) {
</span><span class="cx"> floatLogicalBottom = m_block.nextFloatLogicalBottomBelow(lastFloatLogicalBottom);
</span><span class="cx"> if (floatLogicalBottom <= lastFloatLogicalBottom)
</span><span class="cx"> break;
</span><span class="cx">
</span><del>- newLineLeft = m_block.logicalLeftOffsetForLine(floatLogicalBottom, shouldIndentText());
- newLineRight = m_block.logicalRightOffsetForLine(floatLogicalBottom, shouldIndentText());
- newLineWidth = std::max(0.0f, newLineRight - newLineLeft);
</del><ins>+ newLineWidth = availableWidthAtOffset(m_block, floatLogicalBottom, shouldIndentText());
</ins><span class="cx"> lastFloatLogicalBottom = floatLogicalBottom;
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</span><del>- // FIXME: This code should be refactored to incorporate with the code above.
</del><span class="cx"> ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo();
</span><span class="cx"> if (shapeInsideInfo) {
</span><span class="cx"> LayoutUnit logicalOffsetFromShapeContainer = m_block.logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner()).height();
</span><span class="lines">@@ -193,12 +250,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (newLineWidth > m_availableWidth) {
- m_block.setLogicalHeight(lastFloatLogicalBottom);
- m_availableWidth = newLineWidth + m_overhangWidth;
- m_left = newLineLeft;
- m_right = newLineRight;
- }
</del><ins>+ updateLineDimension(lastFloatLogicalBottom, newLineWidth);
</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 (164612 => 164613)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.h 2014-02-24 22:57:33 UTC (rev 164612)
+++ trunk/Source/WebCore/rendering/line/LineWidth.h 2014-02-24 23:10:32 UTC (rev 164613)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> void addUncommittedWidth(float delta) { m_uncommittedWidth += delta; }
</span><span class="cx"> void commit();
</span><span class="cx"> void applyOverhang(RenderRubyRun*, RenderObject* startRenderer, RenderObject* endRenderer);
</span><del>- void fitBelowFloats();
</del><ins>+ void fitBelowFloats(bool isFirstLine = false);
</ins><span class="cx"> void setTrailingWhitespaceWidth(float collapsedWhitespace, float borderPaddingMargin = 0);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</span><span class="lines">@@ -76,6 +76,10 @@
</span><span class="cx"> private:
</span><span class="cx"> void computeAvailableWidthFromLeftAndRight();
</span><span class="cx"> bool fitsOnLineExcludingTrailingCollapsedWhitespace() const;
</span><ins>+ void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth);
+#if ENABLE(CSS_SHAPES)
+ void wrapNextToShapeOutside(bool isFirstLine);
+#endif
</ins><span class="cx">
</span><span class="cx"> RenderBlockFlow& m_block;
</span><span class="cx"> float m_uncommittedWidth;
</span></span></pre>
</div>
</div>
</body>
</html>