<!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>[167707] 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/167707">167707</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-23 06:36:30 -0700 (Wed, 23 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>[New Multicolumn] fast/multicol/overflow-content.html displays red
https://bugs.webkit.org/show_bug.cgi?id=131809

Patch by Morten Stenshorne &lt;mstensho@opera.com&gt; on 2014-04-23
Reviewed by David Hyatt.

Source/WebCore:
Insert a break at end of content on our own in the multicol code, to make sure
that overflow is accounted for, and also to make sure that we account for all
content in non-final sets (i.e. those preceding spanners).

In other words, this will additionally fix balancing issues in sets preceding
a spanner. Added a test for that.

Tests: fast/multicol/break-in-columns-before-spanner.html
       fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html

* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::regionInRange): Deleted.
* rendering/RenderFlowThread.h:
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::distributeImplicitBreaks):
* rendering/RenderNamedFlowThread.cpp:
(WebCore::RenderNamedFlowThread::applyBreakAfterContent):
* rendering/RenderNamedFlowThread.h:

LayoutTests:
* fast/multicol/break-in-columns-before-spanner-expected.html: Added.
* fast/multicol/break-in-columns-before-spanner.html: Added.
* fast/multicol/newmulticol/compare-with-old-impl/overflow-content-expected.html: Added.
* fast/multicol/newmulticol/compare-with-old-impl/overflow-content.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="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderFlowThreadh">trunk/Source/WebCore/rendering/RenderFlowThread.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadcpp">trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderNamedFlowThreadh">trunk/Source/WebCore/rendering/RenderNamedFlowThread.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolbreakincolumnsbeforespannerexpectedhtml">trunk/LayoutTests/fast/multicol/break-in-columns-before-spanner-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolbreakincolumnsbeforespannerhtml">trunk/LayoutTests/fast/multicol/break-in-columns-before-spanner.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolcomparewitholdimploverflowcontentexpectedhtml">trunk/LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/overflow-content-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolcomparewitholdimploverflowcontenthtml">trunk/LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167706 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-04-23 13:32:56 UTC (rev 167706)
+++ trunk/LayoutTests/ChangeLog        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-04-23  Morten Stenshorne  &lt;mstensho@opera.com&gt;
</span><span class="cx"> 
</span><ins>+        [New Multicolumn] fast/multicol/overflow-content.html displays red
+        https://bugs.webkit.org/show_bug.cgi?id=131809
+
+        Reviewed by David Hyatt.
+
+        * fast/multicol/break-in-columns-before-spanner-expected.html: Added.
+        * fast/multicol/break-in-columns-before-spanner.html: Added.
+        * fast/multicol/newmulticol/compare-with-old-impl/overflow-content-expected.html: Added.
+        * fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html: Added.
+
+2014-04-23  Morten Stenshorne  &lt;mstensho@opera.com&gt;
+
</ins><span class="cx">         Overflow propagation broken in BTT and RTL writing-modes
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=113781
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolbreakincolumnsbeforespannerexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/break-in-columns-before-spanner-expected.html (0 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/break-in-columns-before-spanner-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/multicol/break-in-columns-before-spanner-expected.html        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;script&gt;
+    if (window.internals)
+        internals.settings.setRegionBasedColumnsEnabled(true);
+&lt;/script&gt;
+&lt;p&gt;There should be a blue &lt;em&gt;square&lt;/em&gt; below.&lt;/p&gt;
+&lt;div style=&quot;-webkit-columns:3; columns:3; -webkit-column-gap:0; column-gap:0; column-fill:auto; width:300px; height:200px;&quot;&gt;
+    &amp;nbsp;
+    &lt;div style=&quot;-webkit-column-break-before:always; break-before:column; height:400px; background:blue;&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolbreakincolumnsbeforespannerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/break-in-columns-before-spanner.html (0 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/break-in-columns-before-spanner.html                                (rev 0)
+++ trunk/LayoutTests/fast/multicol/break-in-columns-before-spanner.html        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;script&gt;
+    if (window.internals)
+        internals.settings.setRegionBasedColumnsEnabled(true);
+&lt;/script&gt;
+&lt;p&gt;There should be a blue &lt;em&gt;square&lt;/em&gt; below.&lt;/p&gt;
+&lt;div style=&quot;-webkit-columns:3; columns:3; -webkit-column-gap:0; column-gap:0; width:300px;&quot;&gt;
+    &amp;nbsp;
+    &lt;div style=&quot;-webkit-column-break-before:always; break-before:column; height:400px; background:blue;&quot;&gt;&lt;/div&gt;
+    &lt;div style=&quot;-webkit-column-span:all; column-span:all;&quot;&gt;&amp;nbsp;&lt;/div&gt;
+&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolcomparewitholdimploverflowcontentexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/overflow-content-expected.html (0 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/overflow-content-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/overflow-content-expected.html        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+&lt;style&gt;
+    div.test {
+        -webkit-logical-width: 100px;
+        -webkit-border-before: 5px solid;
+        -webkit-border-after: 15px solid;
+        -webkit-column-count: 2;
+        -webkit-column-gap: 0;
+        -webkit-column-fill: auto;
+        column-count: 2;
+        column-gap: 0;
+        column-fill: auto;
+        background-color: lightblue;
+    }
+    div.container {
+        -webkit-logical-height: 120px;
+        background-color: red;
+        -webkit-logical-width: 100px;
+        -webkit-margin-after: 8px;
+    }
+&lt;/style&gt;
+&lt;div&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot; style=&quot;-webkit-logical-height: 100px;&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 300px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 200px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 10px;&quot;&gt;&lt;/div&gt;
+            &lt;div style=&quot;-webkit-column-break-before: always; -webkit-logical-height: 10px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 100px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;&lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+&lt;/div&gt;
+&lt;div style=&quot;-webkit-writing-mode: vertical-rl;&quot;&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot; style=&quot;-webkit-logical-height: 100px;&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 300px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 200px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 10px;&quot;&gt;&lt;/div&gt;
+            &lt;div style=&quot;-webkit-column-break-before: always; -webkit-logical-height: 10px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 100px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;&lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolcomparewitholdimploverflowcontenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html (0 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html                                (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -0,0 +1,78 @@
</span><ins>+&lt;script&gt;
+    if (window.internals)
+        internals.settings.setRegionBasedColumnsEnabled(true);
+&lt;/script&gt;
+&lt;style&gt;
+    div.test {
+        -webkit-logical-width: 100px;
+        -webkit-border-before: 5px solid;
+        -webkit-border-after: 15px solid;
+        -webkit-column-count: 2;
+        -webkit-column-gap: 0;
+        -webkit-column-fill: auto;
+        column-count: 2;
+        column-gap: 0;
+        column-fill: auto;
+        background-color: lightblue;
+    }
+    div.container {
+        -webkit-logical-height: 120px;
+        background-color: red;
+        -webkit-logical-width: 100px;
+        -webkit-margin-after: 8px;
+    }
+&lt;/style&gt;
+&lt;div&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot; style=&quot;-webkit-logical-height: 100px;&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 300px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 200px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 10px;&quot;&gt;&lt;/div&gt;
+            &lt;div style=&quot;-webkit-column-break-before: always; -webkit-logical-height: 10px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 100px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;&lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+&lt;/div&gt;
+&lt;div style=&quot;-webkit-writing-mode: vertical-rl;&quot;&gt;
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot; style=&quot;-webkit-logical-height: 100px;&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 300px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 200px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div class=&quot;container&quot;&gt;
+        &lt;div class=&quot;test&quot;&gt;
+            &lt;div style=&quot;-webkit-logical-height: 10px;&quot;&gt;&lt;/div&gt;
+            &lt;div style=&quot;-webkit-column-break-before: always; -webkit-logical-height: 10px;&quot;&gt;
+                &lt;div style=&quot;-webkit-logical-height: 100px; background-color: yellow;&quot;&gt;&lt;/div&gt;
+            &lt;/div&gt;
+            &lt;div style=&quot;-webkit-logical-height: 20px;&quot;&gt;&lt;/div&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+&lt;/div&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167706 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-04-23 13:32:56 UTC (rev 167706)
+++ trunk/Source/WebCore/ChangeLog        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-04-23  Morten Stenshorne  &lt;mstensho@opera.com&gt;
</span><span class="cx"> 
</span><ins>+        [New Multicolumn] fast/multicol/overflow-content.html displays red
+        https://bugs.webkit.org/show_bug.cgi?id=131809
+
+        Reviewed by David Hyatt.
+
+        Insert a break at end of content on our own in the multicol code, to make sure
+        that overflow is accounted for, and also to make sure that we account for all
+        content in non-final sets (i.e. those preceding spanners).
+
+        In other words, this will additionally fix balancing issues in sets preceding
+        a spanner. Added a test for that.
+
+        Tests: fast/multicol/break-in-columns-before-spanner.html
+               fast/multicol/newmulticol/compare-with-old-impl/overflow-content.html
+
+        * rendering/RenderFlowThread.cpp:
+        (WebCore::RenderFlowThread::regionInRange): Deleted.
+        * rendering/RenderFlowThread.h:
+        * rendering/RenderMultiColumnSet.cpp:
+        (WebCore::RenderMultiColumnSet::distributeImplicitBreaks):
+        * rendering/RenderNamedFlowThread.cpp:
+        (WebCore::RenderNamedFlowThread::applyBreakAfterContent):
+        * rendering/RenderNamedFlowThread.h:
+
+2014-04-23  Morten Stenshorne  &lt;mstensho@opera.com&gt;
+
</ins><span class="cx">         Overflow propagation broken in BTT and RTL writing-modes
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=113781
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (167706 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp        2014-04-23 13:32:56 UTC (rev 167706)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -789,13 +789,6 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderFlowThread::applyBreakAfterContent(LayoutUnit clientHeight)
-{
-    // Simulate a region break at height. If it points inside an auto logical height region,
-    // then it may determine the region computed autoheight.
-    addForcedRegionBreak(this, clientHeight, this, false);
-}
-
</del><span class="cx"> bool RenderFlowThread::regionInRange(const RenderRegion* targetRegion, const RenderRegion* startRegion, const RenderRegion* endRegion) const
</span><span class="cx"> {
</span><span class="cx">     ASSERT(targetRegion);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (167706 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h        2014-04-23 13:32:56 UTC (rev 167706)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -147,7 +147,7 @@
</span><span class="cx">     void markRegionsForOverflowLayoutIfNeeded();
</span><span class="cx"> 
</span><span class="cx">     virtual bool addForcedRegionBreak(const RenderBlock*, LayoutUnit, RenderBox* breakChild, bool isBefore, LayoutUnit* offsetBreakAdjustment = 0);
</span><del>-    void applyBreakAfterContent(LayoutUnit);
</del><ins>+    virtual void applyBreakAfterContent(LayoutUnit) { }
</ins><span class="cx"> 
</span><span class="cx">     virtual bool isPageLogicalHeightKnown() const { return true; }
</span><span class="cx">     bool pageLogicalSizeChanged() const { return m_pageLogicalSizeChanged; }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (167706 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp        2014-04-23 13:32:56 UTC (rev 167706)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -191,20 +191,16 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderMultiColumnSet::distributeImplicitBreaks()
</span><span class="cx"> {
</span><del>-    unsigned breakCount = forcedBreaksCount();
-
</del><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     // There should be no implicit breaks assumed at this point.
</span><del>-    for (unsigned i = 0; i &lt; breakCount; i++)
</del><ins>+    for (unsigned i = 0; i &lt; forcedBreaksCount(); i++)
</ins><span class="cx">         ASSERT(!m_contentRuns[i].assumedImplicitBreaks());
</span><span class="cx"> #endif // NDEBUG
</span><span class="cx"> 
</span><del>-    if (!breakCount) {
-        // The flow thread would normally insert a forced break at end of content, but if this set
-        // isn't last in the multicol container, we have to do it ourselves.
-        addForcedBreak(logicalBottomInFlowThread());
-        breakCount = 1;
-    }
</del><ins>+    // Insert a final content run to encompass all content. This will include overflow if this is
+    // the last set.
+    addForcedBreak(logicalBottomInFlowThread());
+    unsigned breakCount = forcedBreaksCount();
</ins><span class="cx"> 
</span><span class="cx">     // If there is room for more breaks (to reach the used value of column-count), imagine that we
</span><span class="cx">     // insert implicit breaks at suitable locations. At any given time, the content run with the
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp (167706 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp        2014-04-23 13:32:56 UTC (rev 167706)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.cpp        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -796,6 +796,13 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RenderNamedFlowThread::applyBreakAfterContent(LayoutUnit clientHeight)
+{
+    // Simulate a region break at height. If it points inside an auto logical height region,
+    // then it may determine the region computed autoheight.
+    addForcedRegionBreak(this, clientHeight, this, false);
+}
+
</ins><span class="cx"> bool RenderNamedFlowThread::collectsGraphicsLayersUnderRegions() const
</span><span class="cx"> {
</span><span class="cx">     // We only need to map layers to regions for named flow threads.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderNamedFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderNamedFlowThread.h (167706 => 167707)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderNamedFlowThread.h        2014-04-23 13:32:56 UTC (rev 167706)
+++ trunk/Source/WebCore/rendering/RenderNamedFlowThread.h        2014-04-23 13:36:30 UTC (rev 167707)
</span><span class="lines">@@ -81,6 +81,8 @@
</span><span class="cx">     bool isMarkedForDestruction() const;
</span><span class="cx">     void getRanges(Vector&lt;RefPtr&lt;Range&gt;&gt;&amp;, const RenderNamedFlowFragment*) const;
</span><span class="cx"> 
</span><ins>+    virtual void applyBreakAfterContent(LayoutUnit) override final;
+
</ins><span class="cx">     virtual bool collectsGraphicsLayersUnderRegions() const override;
</span><span class="cx"> 
</span><span class="cx">     // Check if the content is flown into at least a region with region styling rules.
</span></span></pre>
</div>
</div>

</body>
</html>