<!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>[150375] 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/150375">150375</a></dd>
<dt>Author</dt> <dd>zoltan@webkit.org</dd>
<dt>Date</dt> <dd>2013-05-20 12:00:22 -0700 (Mon, 20 May 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>[CSS Regions][CSS Exclusions] shape-inside on regions should respect positioned shapes and overflow
https://bugs.webkit.org/show_bug.cgi?id=116252

Reviewed by David Hyatt.

Regions should respect shape-inside properties which have specified top offset. Since the content which overflows from the
shape should be pushed after the content box (for details check out <a href="http://trac.webkit.org/projects/webkit/changeset/148975">r148975</a>), I implemented  overflowthe behavior for simple
cases when you have only one region. I'm going to implement it for additional regions in a follow up patch.

Tests: fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html
       fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html

Source/WebCore:

* rendering/RenderBlockLineLayout.cpp:
(WebCore::RenderBlock::updateLineBoundariesForExclusions): Handle the flow thread case, push the overflowing content after the
content box. Respect existing shape-inside on region tests.
(WebCore::RenderBlock::layoutRunsAndFloatsInRange): Set the correct logical top position for the shape-inside in
the case of regions. Respect the region's margins and paddings.

LayoutTests:

* fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset-expected.html: Added.
* fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html: Added.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset-expected.html: Added.
* fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.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="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentbasicoverflowshapetopoffsetexpectedhtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentbasicoverflowshapetopoffsethtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentbasicoverflowshapetopoffsetexpectedhtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentbasicoverflowshapetopoffsethtml">trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (150374 => 150375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2013-05-20 18:45:39 UTC (rev 150374)
+++ trunk/LayoutTests/ChangeLog        2013-05-20 19:00:22 UTC (rev 150375)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-05-20  Zoltan Horvath  &lt;zoltan@webkit.org&gt;
+
+        [CSS Regions][CSS Exclusions] shape-inside on regions should respect positioned shapes and overflow
+        https://bugs.webkit.org/show_bug.cgi?id=116252
+
+        Reviewed by David Hyatt.
+
+        Regions should respect shape-inside properties which have specified top offset. Since the content which overflows from the
+        shape should be pushed after the content box (for details check out r148975), I implemented  overflowthe behavior for simple
+        cases when you have only one region. I'm going to implement it for additional regions in a follow up patch.
+
+        Tests: fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html
+               fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html
+
+        * fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset-expected.html: Added.
+        * fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html: Added.
+        * fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset-expected.html: Added.
+        * fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html: Added.
+
</ins><span class="cx"> 2013-05-20  Seokju Kwon  &lt;seokju.kwon@gmail.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Cleanup TestExpectations to pass --lint-test-files
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentbasicoverflowshapetopoffsetexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset-expected.html (0 => 150375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset-expected.html        2013-05-20 19:00:22 UTC (rev 150375)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        #rectangle {
+            font: 20px Ahem, sans-serif;
+            line-height: 20px;
+            width: 200px;
+            height: 200px;
+            border: 2px solid green;
+        }
+        #border {
+            position: relative;
+            top: 48px;
+            left: 48px;
+            width: 100px;
+            height: 100px;
+            border: 2px solid blue;
+        }
+        #overflow { margin-top: 96px;}
+    &lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+    &lt;div id=&quot;rectangle&quot;&gt;
+        &lt;div id=&quot;border&quot;&gt;X X&lt;p&gt; X&lt;p&gt; X&lt;/p&gt;&lt;/p&gt;&lt;/div&gt;
+        &lt;div id=&quot;overflow&quot;&gt;&lt;p&gt;X X X X X X X X X X X X X X X X X X X&lt;/p&gt;&lt;/div&gt;
+    &lt;/div&gt;
+    &lt;p style=&quot;margin-top: 100px;&quot;&gt;Requires Ahem font. The shape-inside on the region is illustrated by the blue rectangle. The content should wrap inside the the blue rectangle, the overflow should start on the left under the content box.&lt;/p&gt;
+    &lt;p&gt;Bug &lt;a href=&quot;http://webkit.org/b/116252&quot;&gt;116252&lt;/a&gt; [CSS Regions][CSS Exclusions] shape-inside on regions should respect positioned shapes and overflow&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsblockcontentbasicoverflowshapetopoffsethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html (0 => 150375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html                                (rev 0)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html        2013-05-20 19:00:22 UTC (rev 150375)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+    &lt;script&gt;
+        if (window.internals)
+            window.internals.settings.setCSSExclusionsEnabled(true);
+    &lt;/script&gt;
+    &lt;style&gt;
+        #rectangle {
+            font: 20px Ahem, sans-serif;
+            line-height: 20px;
+            -webkit-flow-into: flow;
+        }
+        #region {
+            -webkit-flow-from: flow;
+            width: 200px;
+            height: 200px;
+            -webkit-shape-inside: rectangle(50px, 50px, 100px, 100px);
+            border: 2px solid green;
+        }
+        #border {
+            position: absolute;
+            top: 58px;
+            left: 58px;
+            width: 100px;
+            height: 100px;
+            border: 2px solid blue;
+        }
+    &lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+    &lt;div id=&quot;rectangle&quot;&gt;
+       X X&lt;p&gt; X&lt;p&gt; X&lt;/p&gt;&lt;/p&gt;&lt;p&gt;X X X X X X X X X X X X X X X X X X X&lt;/p&gt;
+    &lt;/div&gt;
+
+    &lt;div id=&quot;page&quot;&gt;
+        &lt;div id=&quot;border&quot;&gt;&lt;/div&gt;
+        &lt;div id=&quot;region&quot;&gt;&lt;/div&gt;
+    &lt;/div&gt;
+    &lt;p style=&quot;margin-top: 100px;&quot;&gt;Requires Ahem font. The shape-inside on the region is illustrated by the blue rectangle. The content should wrap inside the the blue rectangle, the overflow should start on the left under the content box.&lt;/p&gt;
+    &lt;p&gt;Bug &lt;a href=&quot;http://webkit.org/b/116252&quot;&gt;116252&lt;/a&gt; [CSS Regions][CSS Exclusions] shape-inside on regions should respect positioned shapes and overflow&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentbasicoverflowshapetopoffsetexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset-expected.html (0 => 150375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset-expected.html        2013-05-20 19:00:22 UTC (rev 150375)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        #rectangle {
+            font: 20px Ahem, sans-serif;
+            line-height: 20px;
+            width: 200px;
+            height: 200px;
+            border: 2px solid green;
+        }
+        #border {
+            position: relative;
+            top: 48px;
+            left: 48px;
+            width: 100px;
+            height: 100px;
+            border: 2px solid blue;
+        }
+        #overflow { margin-top: 96px;}
+    &lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+    &lt;div id=&quot;rectangle&quot;&gt;
+        &lt;div id=&quot;border&quot;&gt;X X X X X X X X X X X X X X X&lt;/div&gt;
+        &lt;div id=&quot;overflow&quot;&gt;X X X X X X X X&lt;/div&gt;
+    &lt;/div&gt;
+    &lt;p style=&quot;margin-top: 100px;&quot;&gt;Requires Ahem font. The shape-inside on the region is illustrated by the blue rectangle. The content should wrap inside the the blue rectangle, the overflow should start on the left under the content box.&lt;/p&gt;
+    &lt;p&gt;Bug &lt;a href=&quot;http://webkit.org/b/116252&quot;&gt;116252&lt;/a&gt; [CSS Regions][CSS Exclusions] shape-inside on regions should respect positioned shapes and overflow&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionsshapeinsideshapeinsideonregionsinlinecontentbasicoverflowshapetopoffsethtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html (0 => 150375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html                                (rev 0)
+++ trunk/LayoutTests/fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html        2013-05-20 19:00:22 UTC (rev 150375)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+&lt;!DOCTYPE HTML&gt;
+&lt;html&gt;
+&lt;head&gt;
+    &lt;script&gt;
+        if (window.internals)
+            window.internals.settings.setCSSExclusionsEnabled(true);
+    &lt;/script&gt;
+    &lt;style&gt;
+        #rectangle {
+            font: 20px Ahem, sans-serif;
+            line-height: 20px;
+            -webkit-flow-into: flow;
+        }
+        #region {
+            -webkit-flow-from: flow;
+            width: 200px;
+            height: 200px;
+            -webkit-shape-inside: rectangle(50px, 50px, 100px, 100px);
+            border: 2px solid green;
+        }
+        #border {
+            position: absolute;
+            top: 58px;
+            left: 58px;
+            width: 100px;
+            height: 100px;
+            border: 2px solid blue;
+        }
+    &lt;/style&gt;
+&lt;/head&gt;
+&lt;body&gt;
+    &lt;div id=&quot;rectangle&quot;&gt;
+       X X X X X X X X X X X X X X X X X X X X X X X
+    &lt;/div&gt;
+
+    &lt;div id=&quot;page&quot;&gt;
+        &lt;div id=&quot;border&quot;&gt;&lt;/div&gt;
+        &lt;div id=&quot;region&quot;&gt;&lt;/div&gt;
+    &lt;/div&gt;
+    &lt;p style=&quot;margin-top: 100px;&quot;&gt;Requires Ahem font. The shape-inside on the region is illustrated by the blue rectangle. The content should wrap inside the the blue rectangle, the overflow should start on the left under the content box.&lt;/p&gt;
+    &lt;p&gt;Bug &lt;a href=&quot;http://webkit.org/b/116252&quot;&gt;116252&lt;/a&gt; [CSS Regions][CSS Exclusions] shape-inside on regions should respect positioned shapes and overflow&lt;/p&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (150374 => 150375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2013-05-20 18:45:39 UTC (rev 150374)
+++ trunk/Source/WebCore/ChangeLog        2013-05-20 19:00:22 UTC (rev 150375)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2013-05-20  Zoltan Horvath  &lt;zoltan@webkit.org&gt;
+
+        [CSS Regions][CSS Exclusions] shape-inside on regions should respect positioned shapes and overflow
+        https://bugs.webkit.org/show_bug.cgi?id=116252
+
+        Reviewed by David Hyatt.
+
+        Regions should respect shape-inside properties which have specified top offset. Since the content which overflows from the
+        shape should be pushed after the content box (for details check out r148975), I implemented  overflowthe behavior for simple
+        cases when you have only one region. I'm going to implement it for additional regions in a follow up patch.
+
+        Tests: fast/regions/shape-inside/shape-inside-on-regions-block-content-basic-overflow-shape-top-offset.html
+               fast/regions/shape-inside/shape-inside-on-regions-inline-content-basic-overflow-shape-top-offset.html
+
+        * rendering/RenderBlockLineLayout.cpp:
+        (WebCore::RenderBlock::updateLineBoundariesForExclusions): Handle the flow thread case, push the overflowing content after the
+        content box. Respect existing shape-inside on region tests.
+        (WebCore::RenderBlock::layoutRunsAndFloatsInRange): Set the correct logical top position for the shape-inside in
+        the case of regions. Respect the region's margins and paddings.
+
</ins><span class="cx"> 2013-05-20  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Remove custom binding for the Clipboard clearData function
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockLineLayoutcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp (150374 => 150375)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp        2013-05-20 18:45:39 UTC (rev 150374)
+++ trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp        2013-05-20 19:00:22 UTC (rev 150375)
</span><span class="lines">@@ -1672,8 +1672,16 @@
</span><span class="cx"> 
</span><span class="cx">     // The overflow should be pushed below the content box
</span><span class="cx">     LayoutUnit shapeContainingBlockHeight = exclusionShapeInsideInfo-&gt;shapeContainingBlockHeight();
</span><del>-    if (!flowThreadContainingBlock() &amp;&amp; !exclusionShapeInsideInfo-&gt;lineWithinShapeBounds() &amp;&amp; !lineOverflowsFromShapeInside &amp;&amp; shapeContainingBlockHeight) {
-        setLogicalHeight(shapeContainingBlockHeight);
</del><ins>+    if (!exclusionShapeInsideInfo-&gt;lineWithinShapeBounds() &amp;&amp; !lineOverflowsFromShapeInside &amp;&amp; shapeContainingBlockHeight) {
+        LayoutUnit newHeight = shapeContainingBlockHeight;
+
+        if (layoutState.flowThread()) {
+            // If block contents flown across multiple regions and the shape-inside was applied on the second region we can end up with negative lineTop
+            if (lineTop &lt; 0)
+                return;
+            newHeight = logicalHeight + shapeContainingBlockHeight - lineTop - currentRegion-&gt;borderAndPaddingBefore();
+        }
+        setLogicalHeight(newHeight);
</ins><span class="cx">         lineOverflowsFromShapeInside = true;
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="lines">@@ -1717,8 +1725,12 @@
</span><span class="cx">             absoluteLogicalTop = logicalTop();
</span><span class="cx">         }
</span><span class="cx">         // Begin layout at the logical top of our shape inside.
</span><del>-        if (logicalHeight() + absoluteLogicalTop &lt; exclusionShapeInsideInfo-&gt;shapeLogicalTop() &amp;&amp; !layoutState.flowThread())
-            setLogicalHeight(exclusionShapeInsideInfo-&gt;shapeLogicalTop() - absoluteLogicalTop);
</del><ins>+        if (logicalHeight() + absoluteLogicalTop &lt; exclusionShapeInsideInfo-&gt;shapeLogicalTop()) {
+            LayoutUnit logicalHeight = exclusionShapeInsideInfo-&gt;shapeLogicalTop() - absoluteLogicalTop;
+            if (layoutState.flowThread())
+                logicalHeight -= exclusionShapeInsideInfo-&gt;owner()-&gt;borderAndPaddingBefore();
+            setLogicalHeight(logicalHeight);
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     bool lineOverflowsFromShapeInside = false;
</span></span></pre>
</div>
</div>

</body>
</html>