<!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>[161384] 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/161384">161384</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-06 16:42:41 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions][CSS Shapes] ASSERTION FAILED: m_segmentRanges.size() < m_segments.size()
https://bugs.webkit.org/show_bug.cgi?id=125770
Reviewed by Bem Jones-Bey.
Source/WebCore:
When we have an e.g. up-side-down triangle, when the content doesn't fit in the bottom part of the shape,
and the adjusted content flows into the next region with a shape, we need to update the actual shape
and region. Since it wasn't updated, it led to a shape mismatch, which led to assert/layout error.
Test: fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html
* rendering/RenderBlockLineLayout.cpp:
(WebiCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread): Update current shape
and region, when adjustment occured.
LayoutTests:
* fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html: Added.
* fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-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="#trunkSourceWebCorerenderingRenderBlockLineLayoutcpp">trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleregionsbottomadjustmentexpectedhtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleregionsbottomadjustmenthtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (161383 => 161384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-07 00:35:25 UTC (rev 161383)
+++ trunk/LayoutTests/ChangeLog 2014-01-07 00:42:41 UTC (rev 161384)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-01-06 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Regions][CSS Shapes] ASSERTION FAILED: m_segmentRanges.size() < m_segments.size()
+ https://bugs.webkit.org/show_bug.cgi?id=125770
+
+ Reviewed by Bem Jones-Bey.
+
+ * fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html: Added.
+ * fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html: Added.
+
</ins><span class="cx"> 2014-01-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed test correction.
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleregionsbottomadjustmentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html (0 => 161384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html (rev 0)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment-expected.html 2014-01-07 00:42:41 UTC (rev 161384)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.region {
+ width: 100px;
+ height: 100px;
+ margin-top: 10px;
+ background-color: #CCD8D4;
+}
+
+.page {
+ font: 20px/1 Ahem, sans-serif;
+}
+</style>
+</head>
+
+<body>
+ <div class="page">
+ <div class="region">
+ <span style="margin-left: 30px;"></span>X X<br/>
+ <span style="margin-left: 35px;"></span>X<br/>
+ <span style="margin-left: 40px;"></span>X
+ </div>
+ <div class="region">
+ <span style="margin-left: 30px;"></span>X X<br/>
+ <span style="margin-left: 35px;"></span>X<br/>
+ <span style="margin-left: 40px;"></span>X
+ </div>
+ X X
+ </div>
+ <p style="margin-top: 20px;">
+ Requires Ahem font. We have two regions, an up-side-down triangular shape is applied on the regions.
+ The content should flow from the first shape to the second shape. The overflow should be pushed down below the content box.
+ </p>
+ <p>Bug <a href="http://webkit.org/b/125770">125770</a>: [CSS Regions][CSS Shapes] ASSERTION FAILED: m_segmentRanges.size() < m_segments.size()</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonmultipleregionsbottomadjustmenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html (0 => 161384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html (rev 0)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html 2014-01-07 00:42:41 UTC (rev 161384)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+.region {
+ width: 100px;
+ height: 100px;
+ margin-top: 10px;
+ background-color: #CCD8D4;
+ -webkit-shape-inside: polygon(25px 0px, 100px 0px, 50px 100px);
+}
+
+.content {
+ font: 20px/1 Ahem, sans-serif;
+ -webkit-flow-into: flow;
+}
+
+.region { -webkit-flow-from: flow; }
+</style>
+</head>
+
+<body>
+ <div class="content">X X X X X X X X X X</div>
+
+ <div class="page">
+ <div class="region"></div>
+ <div class="region"></div>
+ </div>
+ <p style="margin-top: 40px;">
+ Requires Ahem font. We have two regions, an up-side-down triangular shape is applied on the regions.
+ The content should flow from the first shape to the second shape. The overflow should be pushed down below the content box.
+ </p>
+ <p>Bug <a href="http://webkit.org/b/125770">125770</a>: [CSS Regions][CSS Shapes] ASSERTION FAILED: m_segmentRanges.size() < m_segments.size()</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161383 => 161384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-07 00:35:25 UTC (rev 161383)
+++ trunk/Source/WebCore/ChangeLog 2014-01-07 00:42:41 UTC (rev 161384)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-06 Zoltan Horvath <zoltan@webkit.org>
+
+ [CSS Regions][CSS Shapes] ASSERTION FAILED: m_segmentRanges.size() < m_segments.size()
+ https://bugs.webkit.org/show_bug.cgi?id=125770
+
+ Reviewed by Bem Jones-Bey.
+
+ When we have an e.g. up-side-down triangle, when the content doesn't fit in the bottom part of the shape,
+ and the adjusted content flows into the next region with a shape, we need to update the actual shape
+ and region. Since it wasn't updated, it led to a shape mismatch, which led to assert/layout error.
+
+ Test: fast/regions/shape-inside/shape-inside-on-multiple-regions-bottom-adjustment.html
+
+ * rendering/RenderBlockLineLayout.cpp:
+ (WebiCore::RenderBlockFlow::updateShapeAndSegmentsForCurrentLineInFlowThread): Update current shape
+ and region, when adjustment occured.
+
</ins><span class="cx"> 2014-01-06 Seokju Kwon <seokju@webkit.org>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Get rid of Inspector/BindingVisitors.h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (161383 => 161384)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-01-07 00:35:25 UTC (rev 161383)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp 2014-01-07 00:42:41 UTC (rev 161384)
</span><span class="lines">@@ -1168,7 +1168,8 @@
</span><span class="cx"> shapeBottomInFlowThread = shapeInsideInfo->shapeLogicalBottom() + currentRegion->logicalTopForFlowThreadContent();
</span><span class="cx">
</span><span class="cx"> bool lineOverLapsWithShapeBottom = shapeBottomInFlowThread < logicalLineBottomInFlowThread;
</span><del>- bool lineOverLapsWithRegionBottom = logicalLineBottomInFlowThread > logicalRegionBottomInFlowThread;
</del><ins>+ bool lineTopAdjustedIntoNextRegion = layoutState.adjustedLogicalLineTop() >= currentRegion->logicalHeight();
+ bool lineOverLapsWithRegionBottom = logicalLineBottomInFlowThread > logicalRegionBottomInFlowThread || lineTopAdjustedIntoNextRegion;
</ins><span class="cx"> bool overFlowsToNextRegion = nextRegion && (lineOverLapsWithShapeBottom || lineOverLapsWithRegionBottom);
</span><span class="cx">
</span><span class="cx"> // If the line is between two shapes/regions we position the line to the top of the next shape/region
</span><span class="lines">@@ -1184,6 +1185,9 @@
</span><span class="cx"> logicalLineBottomInFlowThread = logicalLineTopInFlowThread + lineHeight;
</span><span class="cx"> logicalRegionTopInFlowThread = currentRegion->logicalTopForFlowThreadContent();
</span><span class="cx"> logicalRegionBottomInFlowThread = logicalRegionTopInFlowThread + currentRegion->logicalHeight() - currentRegion->borderAndPaddingBefore() - currentRegion->borderAndPaddingAfter();
</span><ins>+
+ if (lineTopAdjustedIntoNextRegion)
+ layoutState.setAdjustedLogicalLineTop(0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!shapeInsideInfo)
</span></span></pre>
</div>
</div>
</body>
</html>