<!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>[162694] 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/162694">162694</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-24 00:00:47 -0800 (Fri, 24 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Region based multicol: unresolvable percent height results in 1px tall multicol
https://bugs.webkit.org/show_bug.cgi?id=122826
Patch by Morten Stenshorne <mstensho@opera.com> on 2014-01-23
Reviewed by David Hyatt.
Source/WebCore:
If a box has a percentage height, but the computed height of its
containing block is auto, the computed height of the box also becomes
auto. computeContentLogicalHeight() returns -1 if the height isn't
resolvable, and we need to make sure that such a value doesn't
constrain the height of the multicol container.
Tests: fast/multicol/newmulticol/unresolvable-percent-height-2.html
fast/multicol/newmulticol/unresolvable-percent-height.html
fast/multicol/newmulticol/unresolvable-percent-max-height-2.html
fast/multicol/newmulticol/unresolvable-percent-max-height.html
* rendering/RenderMultiColumnSet.cpp:
(WebCore::RenderMultiColumnSet::RenderMultiColumnSet):
(WebCore::RenderMultiColumnSet::calculateBalancedHeight):
(WebCore::RenderMultiColumnSet::recalculateBalancedHeight):
(WebCore::RenderMultiColumnSet::prepareForLayout):
LayoutTests:
* fast/multicol/newmulticol/unresolvable-percent-height-2-expected.html: Added.
* fast/multicol/newmulticol/unresolvable-percent-height-2.html: Added.
* fast/multicol/newmulticol/unresolvable-percent-height-expected.html: Added.
* fast/multicol/newmulticol/unresolvable-percent-height.html: Added.
* fast/multicol/newmulticol/unresolvable-percent-max-height-2-expected.html: Added.
* fast/multicol/newmulticol/unresolvable-percent-max-height-2.html: Added.
* fast/multicol/newmulticol/unresolvable-percent-max-height-expected.html: Added.
* fast/multicol/newmulticol/unresolvable-percent-max-height.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="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentheight2expectedhtml">trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-2-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentheight2html">trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-2.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentheightexpectedhtml">trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentheighthtml">trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentmaxheight2expectedhtml">trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-2-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentmaxheight2html">trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-2.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentmaxheightexpectedhtml">trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentmaxheighthtml">trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (162693 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-01-24 06:12:57 UTC (rev 162693)
+++ trunk/LayoutTests/ChangeLog 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-01-23 Morten Stenshorne <mstensho@opera.com>
+
+ Region based multicol: unresolvable percent height results in 1px tall multicol
+ https://bugs.webkit.org/show_bug.cgi?id=122826
+
+ Reviewed by David Hyatt.
+
+ * fast/multicol/newmulticol/unresolvable-percent-height-2-expected.html: Added.
+ * fast/multicol/newmulticol/unresolvable-percent-height-2.html: Added.
+ * fast/multicol/newmulticol/unresolvable-percent-height-expected.html: Added.
+ * fast/multicol/newmulticol/unresolvable-percent-height.html: Added.
+ * fast/multicol/newmulticol/unresolvable-percent-max-height-2-expected.html: Added.
+ * fast/multicol/newmulticol/unresolvable-percent-max-height-2.html: Added.
+ * fast/multicol/newmulticol/unresolvable-percent-max-height-expected.html: Added.
+ * fast/multicol/newmulticol/unresolvable-percent-max-height.html: Added.
+
</ins><span class="cx"> 2014-01-23 ChangSeok Oh <changseok.oh@collabora.com>
</span><span class="cx">
</span><span class="cx"> Dragging from inner side of video to outside causes a crash
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentheight2expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-2-expected.html (0 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-2-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-2-expected.html 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Multicol with unresolvable percentage height</title>
+ </head>
+ <body>
+ <p>There should be a blue square below, and no unnecessary scrollbar.</p>
+ <div style="width:200px; height:200px; background:blue;"></div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentheight2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-2.html (0 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-2.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-2.html 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Multicol with unresolvable percentage height</title>
+ <script>
+ if (window.internals)
+ internals.settings.setRegionBasedColumnsEnabled(true);
+ </script>
+ </head>
+ <body>
+ <p>There should be a blue square below, and no unnecessary scrollbar.</p>
+ <div style="-webkit-columns:2; columns:2; width:200px; height:100%; max-height:200px; background:blue;">
+ <div style="height:600px;"></div>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentheightexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-expected.html (0 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height-expected.html 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Multicol with unresolvable percentage height</title>
+ </head>
+ <body>
+ <p>There should be a blue square below, and no unnecessary scrollbar.</p>
+ <div style="width:200px; height:200px; background:blue;"></div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentheighthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height.html (0 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-height.html 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Multicol with unresolvable percentage height</title>
+ <script>
+ if (window.internals)
+ internals.settings.setRegionBasedColumnsEnabled(true);
+ </script>
+ </head>
+ <body>
+ <p>There should be a blue square below, and no unnecessary scrollbar.</p>
+ <div style="-webkit-columns:2; columns:2; width:200px; height:100%; background:blue;">
+ <div style="height:400px;"></div>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentmaxheight2expectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-2-expected.html (0 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-2-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-2-expected.html 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Multicol with unresolvable percentage height</title>
+ </head>
+ <body>
+ <p>There should be a blue square below, and no unnecessary scrollbar.</p>
+ <div style="width:200px; height:200px; background:blue;"></div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentmaxheight2html"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-2.html (0 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-2.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-2.html 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Multicol with unresolvable percentage height</title>
+ <script>
+ if (window.internals)
+ internals.settings.setRegionBasedColumnsEnabled(true);
+ </script>
+ </head>
+ <body>
+ <p>There should be a blue square below, and no unnecessary scrollbar.</p>
+ <div style="-webkit-columns:2; columns:2; width:200px; max-height:100%; height:200px; background:blue;">
+ <div style="height:600px;"></div>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentmaxheightexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-expected.html (0 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height-expected.html 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Multicol with unresolvable percentage height</title>
+ </head>
+ <body>
+ <p>There should be a blue square below, and no unnecessary scrollbar.</p>
+ <div style="width:200px; height:200px; background:blue;"></div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolunresolvablepercentmaxheighthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height.html (0 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/unresolvable-percent-max-height.html 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Multicol with unresolvable percentage height</title>
+ <script>
+ if (window.internals)
+ internals.settings.setRegionBasedColumnsEnabled(true);
+ </script>
+ </head>
+ <body>
+ <p>There should be a blue square below, and no unnecessary scrollbar.</p>
+ <div style="-webkit-columns:2; columns:2; width:200px; max-height:100%; background:blue;">
+ <div style="height:400px;"></div>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (162693 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-24 06:12:57 UTC (rev 162693)
+++ trunk/Source/WebCore/ChangeLog 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2014-01-23 Morten Stenshorne <mstensho@opera.com>
+
+ Region based multicol: unresolvable percent height results in 1px tall multicol
+ https://bugs.webkit.org/show_bug.cgi?id=122826
+
+ Reviewed by David Hyatt.
+
+ If a box has a percentage height, but the computed height of its
+ containing block is auto, the computed height of the box also becomes
+ auto. computeContentLogicalHeight() returns -1 if the height isn't
+ resolvable, and we need to make sure that such a value doesn't
+ constrain the height of the multicol container.
+
+ Tests: fast/multicol/newmulticol/unresolvable-percent-height-2.html
+ fast/multicol/newmulticol/unresolvable-percent-height.html
+ fast/multicol/newmulticol/unresolvable-percent-max-height-2.html
+ fast/multicol/newmulticol/unresolvable-percent-max-height.html
+
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::RenderMultiColumnSet):
+ (WebCore::RenderMultiColumnSet::calculateBalancedHeight):
+ (WebCore::RenderMultiColumnSet::recalculateBalancedHeight):
+ (WebCore::RenderMultiColumnSet::prepareForLayout):
+
</ins><span class="cx"> 2014-01-23 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Move ContentSearchUtils, ScriptBreakpoint, and ScriptDebugListener into JavaScriptCore for inspector
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (162693 => 162694)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-01-24 06:12:57 UTC (rev 162693)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2014-01-24 08:00:47 UTC (rev 162694)
</span><span class="lines">@@ -38,8 +38,8 @@
</span><span class="cx"> , m_computedColumnCount(1)
</span><span class="cx"> , m_computedColumnWidth(0)
</span><span class="cx"> , m_computedColumnHeight(0)
</span><del>- , m_maxColumnHeight(LayoutUnit::max())
- , m_minSpaceShortage(LayoutUnit::max())
</del><ins>+ , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight())
+ , m_minSpaceShortage(RenderFlowThread::maxLogicalHeight())
</ins><span class="cx"> , m_minimumColumnHeight(0)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -138,8 +138,8 @@
</span><span class="cx"> // amount of space shortage found during layout.
</span><span class="cx">
</span><span class="cx"> ASSERT(m_minSpaceShortage > 0); // We should never _shrink_ the height!
</span><del>- ASSERT(m_minSpaceShortage != LayoutUnit::max()); // If this happens, we probably have a bug.
- if (m_minSpaceShortage == LayoutUnit::max())
</del><ins>+ ASSERT(m_minSpaceShortage != RenderFlowThread::maxLogicalHeight()); // If this happens, we probably have a bug.
+ if (m_minSpaceShortage == RenderFlowThread::maxLogicalHeight())
</ins><span class="cx"> return m_computedColumnHeight; // So bail out rather than looping infinitely.
</span><span class="cx">
</span><span class="cx"> return m_computedColumnHeight + m_minSpaceShortage;
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> if (m_computedColumnHeight == oldColumnHeight)
</span><span class="cx"> return false; // No change. We're done.
</span><span class="cx">
</span><del>- m_minSpaceShortage = LayoutUnit::max();
</del><ins>+ m_minSpaceShortage = RenderFlowThread::maxLogicalHeight();
</ins><span class="cx"> clearForcedBreaks();
</span><span class="cx"> return true; // Need another pass.
</span><span class="cx"> }
</span><span class="lines">@@ -234,12 +234,15 @@
</span><span class="cx">
</span><span class="cx"> if (multicolBlock->requiresBalancing()) {
</span><span class="cx"> // Set maximum column height. We will not stretch beyond this.
</span><del>- m_maxColumnHeight = LayoutUnit::max();
- if (!multicolStyle.logicalHeight().isAuto())
</del><ins>+ m_maxColumnHeight = RenderFlowThread::maxLogicalHeight();
+ if (!multicolStyle.logicalHeight().isAuto()) {
</ins><span class="cx"> m_maxColumnHeight = multicolBlock->computeContentLogicalHeight(multicolStyle.logicalHeight());
</span><ins>+ if (m_maxColumnHeight == -1)
+ m_maxColumnHeight = RenderFlowThread::maxLogicalHeight();
+ }
</ins><span class="cx"> if (!multicolStyle.logicalMaxHeight().isUndefined()) {
</span><span class="cx"> LayoutUnit logicalMaxHeight = multicolBlock->computeContentLogicalHeight(multicolStyle.logicalMaxHeight());
</span><del>- if (m_maxColumnHeight > logicalMaxHeight)
</del><ins>+ if (logicalMaxHeight != -1 && m_maxColumnHeight > logicalMaxHeight)
</ins><span class="cx"> m_maxColumnHeight = logicalMaxHeight;
</span><span class="cx"> }
</span><span class="cx"> m_maxColumnHeight = heightAdjustedForSetOffset(m_maxColumnHeight);
</span></span></pre>
</div>
</div>
</body>
</html>