<!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>[164868] 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/164868">164868</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-28 10:14:41 -0800 (Fri, 28 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Shapes] Update line segments for ShapeInside only if the new line is wide enough
https://bugs.webkit.org/show_bug.cgi?id=129461
Reviewed by David Hyatt.
Shape-inside can make a line only narrower than the original line width, thus we don't need
to update the line/shape segments in fitBelowFloats for every single line inside shape-inside.
This patch adds a helper function, which updates the line segments, furthermore it updates the
line segments only when the content would fit without the shape.
No new tests, no behavior change.
* rendering/line/BreakingContextInlineHeaders.h: Use new helper.
(WebCore::updateSegmentsForShapes):
* rendering/line/LineWidth.cpp: Use new helper.
(WebCore::LineWidth::updateLineSegment): Add new helper.
(WebCore::LineWidth::fitBelowFloats):</pre>
<h3>Modified Paths</h3>
<ul>
<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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164867 => 164868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-28 18:12:52 UTC (rev 164867)
+++ trunk/Source/WebCore/ChangeLog 2014-02-28 18:14:41 UTC (rev 164868)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2014-02-28 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Shapes] Update line segments for ShapeInside only if the new line is wide enough
+ https://bugs.webkit.org/show_bug.cgi?id=129461
+
+ Reviewed by David Hyatt.
+
+ Shape-inside can make a line only narrower than the original line width, thus we don't need
+ to update the line/shape segments in fitBelowFloats for every single line inside shape-inside.
+ This patch adds a helper function, which updates the line segments, furthermore it updates the
+ line segments only when the content would fit without the shape.
+
+ No new tests, no behavior change.
+
+ * rendering/line/BreakingContextInlineHeaders.h: Use new helper.
+ (WebCore::updateSegmentsForShapes):
+ * rendering/line/LineWidth.cpp: Use new helper.
+ (WebCore::LineWidth::updateLineSegment): Add new helper.
+ (WebCore::LineWidth::fitBelowFloats):
+
</ins><span class="cx"> 2014-02-28 Mario Sanchez Prada <mario.prada@samsung.com>
</span><span class="cx">
</span><span class="cx"> paragraphs with different directionality in textarea with unicode-bidi: plaintext are aligned the same
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineBreakingContextInlineHeadersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h (164867 => 164868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-02-28 18:12:52 UTC (rev 164867)
+++ trunk/Source/WebCore/rendering/line/BreakingContextInlineHeaders.h 2014-02-28 18:14:41 UTC (rev 164868)
</span><span class="lines">@@ -461,6 +461,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</span><ins>+// FIXME: We can move this function & logic into LineWidth::fitBelowFloats
</ins><span class="cx"> inline void updateSegmentsForShapes(RenderBlockFlow& block, const FloatingObject* lastFloatFromPreviousLine, const WordMeasurements& wordMeasurements, LineWidth& width, bool isFirstLine)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(lastFloatFromPreviousLine);
</span><span class="lines">@@ -495,11 +496,7 @@
</span><span class="cx"> block.setLogicalHeight(shapeInsideInfo->logicalLineTop() - logicalOffsetFromShapeContainer);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- lineLogicalTop = block.logicalHeight() + logicalOffsetFromShapeContainer;
-
- shapeInsideInfo->updateSegmentsForLine(lineLogicalTop, lineLogicalHeight);
- width.updateCurrentShapeSegment();
- width.updateAvailableWidth();
</del><ins>+ width.updateLineSegment(block.logicalHeight());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.cpp (164867 => 164868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-02-28 18:12:52 UTC (rev 164867)
+++ trunk/Source/WebCore/rendering/line/LineWidth.cpp 2014-02-28 18:14:41 UTC (rev 164868)
</span><span class="lines">@@ -216,7 +216,22 @@
</span><span class="cx"> }
</span><span class="cx"> updateLineDimension(newLineTop, newLineWidth, newLineLeft, newLineRight);
</span><span class="cx"> }
</span><ins>+
+#if ENABLE(CSS_SHAPE_INSIDE)
+void LineWidth::updateLineSegment(const LayoutUnit& lineTop)
+{
+ ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo();
+ if (!shapeInsideInfo)
+ return;
+
+ LayoutUnit logicalOffsetFromShapeContainer = m_block.logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner()).height();
+ LayoutUnit lineHeight = m_block.lineHeight(false, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
+ shapeInsideInfo->updateSegmentsForLine(lineTop + logicalOffsetFromShapeContainer, lineHeight);
+ updateCurrentShapeSegment();
+ updateAvailableWidth();
+}
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> void LineWidth::fitBelowFloats(bool isFirstLine)
</span><span class="cx"> {
</span><span class="lines">@@ -247,18 +262,12 @@
</span><span class="cx"> newLineWidth = availableWidthAtOffset(m_block, floatLogicalBottom, shouldIndentText(), newLineLeft, newLineRight);
</span><span class="cx"> lastFloatLogicalBottom = floatLogicalBottom;
</span><span class="cx">
</span><ins>+ if (newLineWidth >= m_uncommittedWidth) {
</ins><span class="cx"> #if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</span><del>- ShapeInsideInfo* shapeInsideInfo = m_block.layoutShapeInsideInfo();
- if (shapeInsideInfo) {
- LayoutUnit logicalOffsetFromShapeContainer = m_block.logicalOffsetFromShapeAncestorContainer(&shapeInsideInfo->owner()).height();
- LayoutUnit lineHeight = m_block.lineHeight(false, m_block.isHorizontalWritingMode() ? HorizontalLine : VerticalLine, PositionOfInteriorLineBoxes);
- shapeInsideInfo->updateSegmentsForLine(lastFloatLogicalBottom + logicalOffsetFromShapeContainer, lineHeight);
- updateCurrentShapeSegment();
- updateAvailableWidth();
- }
</del><ins>+ updateLineSegment(lastFloatLogicalBottom);
</ins><span class="cx"> #endif
</span><del>- if (newLineWidth >= m_uncommittedWidth)
</del><span class="cx"> break;
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> updateLineDimension(lastFloatLogicalBottom, newLineWidth, newLineLeft, newLineRight);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderinglineLineWidthh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/line/LineWidth.h (164867 => 164868)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/line/LineWidth.h 2014-02-28 18:12:52 UTC (rev 164867)
+++ trunk/Source/WebCore/rendering/line/LineWidth.h 2014-02-28 18:14:41 UTC (rev 164868)
</span><span class="lines">@@ -66,20 +66,21 @@
</span><span class="cx"> void applyOverhang(RenderRubyRun*, RenderObject* startRenderer, RenderObject* endRenderer);
</span><span class="cx"> void fitBelowFloats(bool isFirstLine = false);
</span><span class="cx"> void setTrailingWhitespaceWidth(float collapsedWhitespace, float borderPaddingMargin = 0);
</span><del>-
</del><ins>+ bool shouldIndentText() const { return m_shouldIndentText == IndentText; }
</ins><span class="cx"> #if ENABLE(CSS_SHAPES) && ENABLE(CSS_SHAPE_INSIDE)
</span><del>- void updateCurrentShapeSegment();
</del><ins>+ void updateLineSegment(const LayoutUnit&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>- bool shouldIndentText() const { return m_shouldIndentText == IndentText; }
-
</del><span class="cx"> private:
</span><span class="cx"> void computeAvailableWidthFromLeftAndRight();
</span><span class="cx"> bool fitsOnLineExcludingTrailingCollapsedWhitespace() const;
</span><span class="cx"> void updateLineDimension(LayoutUnit newLineTop, LayoutUnit newLineWidth, float newLineLeft, float newLineRight);
</span><span class="cx"> #if ENABLE(CSS_SHAPES)
</span><span class="cx"> void wrapNextToShapeOutside(bool isFirstLine);
</span><ins>+#if ENABLE(CSS_SHAPE_INSIDE)
+ void updateCurrentShapeSegment();
</ins><span class="cx"> #endif
</span><ins>+#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>