<!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>[180364] 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/180364">180364</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2015-02-19 13:42:21 -0800 (Thu, 19 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix for unsplittable content being paginated by columns.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschildexpectedpng">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png</a></li>
<li><a href="#trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschildexpectedtxt">trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp">trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSetcpp">trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMultiColumnSeth">trunk/Source/WebCore/rendering/RenderMultiColumnSet.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolinlinetabledynamicmovementexpectedhtml">trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolinlinetabledynamicmovementhtml">trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (180363 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-02-19 21:38:09 UTC (rev 180363)
+++ trunk/LayoutTests/ChangeLog        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-02-19 David Hyatt <hyatt@apple.com>
+
+ Columns are splitting unsplittable content.
+ https://bugs.webkit.org/show_bug.cgi?id=141807
+ <rdar://problem/18387659>
+
+ Reviewed by Dean Jackson.
+
+ * fast/multicol/inline-table-dynamic-movement-expected.html: Added.
+ * fast/multicol/inline-table-dynamic-movement.html: Added.
+ * platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png:
+ * platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt:
+
</ins><span class="cx"> 2015-02-19 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Create Separate Model and View Objects for RemoteObjects / ObjectPreview / PropertyDescriptor
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolinlinetabledynamicmovementexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html (0 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html         (rev 0)
+++ trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement-expected.html        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+
+
+<div id='test' style="-webkit-columns:2; height:500px; border:3px solid black; -webkit-column-fill: auto"><div style="height:150px; background-color:lime"></div>
+
+<table style="display:inline-table; height:300px"><tr><td style="vertical-align:middle; height:100%">Hello world<br><img style="height:250px;width:175px; background-color:purple">
+<td style="vertical-align:middle; height:100%">Also world<br>
+<img style="height:250px;width:175px; background-color:purple">
+</table>
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolinlinetabledynamicmovementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement.html (0 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement.html         (rev 0)
+++ trunk/LayoutTests/fast/multicol/inline-table-dynamic-movement.html        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+
+<script>
+function doIt()
+{
+document.getElementById('test').offsetHeight
+document.getElementById('test').style.height = '500px';
+}
+</script>
+
+<div id='test' style="-webkit-columns:2; height:400px; border:3px solid black; -webkit-column-fill: auto"><div style="height:150px; background-color:lime"></div>
+
+<table style="display:inline-table; height:300px"><tr><td style="vertical-align:middle; height:100%">Hello world<br><img style="height:250px;width:175px; background-color:purple">
+<td style="vertical-align:middle; height:100%">Also world<br>
+<img style="height:250px;width:175px; background-color:purple">
+</table>
+
+</div>
+
+<script>
+doIt()
+</script>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschildexpectedpng"></a>
<div class="binary"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.png</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacfastmulticolspanspanasimmediatecolumnschildexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt (180363 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt        2015-02-19 21:38:09 UTC (rev 180363)
+++ trunk/LayoutTests/platform/mac/fast/multicol/span/span-as-immediate-columns-child-expected.txt        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -1,8 +1,8 @@
</span><del>-layer at (0,0) size 785x3439
</del><ins>+layer at (0,0) size 785x3430
</ins><span class="cx"> RenderView at (0,0) size 785x600
</span><del>-layer at (0,0) size 785x3439
- RenderBlock {HTML} at (0,0) size 785x3439
- RenderBody {BODY} at (8,16) size 769x3407
</del><ins>+layer at (0,0) size 785x3430
+ RenderBlock {HTML} at (0,0) size 785x3430
+ RenderBody {BODY} at (8,16) size 769x3398
</ins><span class="cx"> layer at (8,16) size 760x402
</span><span class="cx"> RenderBlock {DIV} at (0,0) size 760x402 [border: (5px solid #800000)]
</span><span class="cx"> RenderBlock {H2} at (5,24) size 750x29 [bgcolor=#EEEEEE]
</span><span class="lines">@@ -299,14 +299,14 @@
</span><span class="cx"> text run at (0,144) width 351: "condimentum vestibulum. Suspendisse hendrerit quam"
</span><span class="cx"> text run at (0,162) width 333: "nec felis. Sed varius turpis vitae pede. Lorem ipsum"
</span><span class="cx"> text run at (0,180) width 275: "dolor sit amet, consectetuer adipiscing elit."
</span><del>-layer at (8,2511) size 760x444
- RenderBlock {DIV} at (0,2495) size 760x445 [border: (5px solid #800000)]
- RenderMultiColumnSet at (5,5) size 750x338
- RenderBlock {H2} at (5,362) size 750x57 [bgcolor=#EEEEEE]
</del><ins>+layer at (8,2511) size 760x435
+ RenderBlock {DIV} at (0,2495) size 760x436 [border: (5px solid #800000)]
+ RenderMultiColumnSet at (5,5) size 750x329
+ RenderBlock {H2} at (5,353) size 750x57 [bgcolor=#EEEEEE]
</ins><span class="cx"> RenderText {#text} at (0,0) size 709x56
</span><span class="cx"> text run at (0,0) width 709: "This is a spanning element at the end of the columns block with block"
</span><span class="cx"> text run at (0,28) width 84: "siblings."
</span><del>- RenderMultiColumnSet at (5,438) size 750x0
</del><ins>+ RenderMultiColumnSet at (5,429) size 750x0
</ins><span class="cx"> layer at (13,2516) size 367x658
</span><span class="cx"> RenderMultiColumnFlowThread at (5,5) size 367x658
</span><span class="cx"> RenderBlock {P} at (0,16) size 367x198
</span><span class="lines">@@ -322,20 +322,20 @@
</span><span class="cx"> text run at (0,144) width 351: "condimentum vestibulum. Suspendisse hendrerit quam"
</span><span class="cx"> text run at (0,162) width 333: "nec felis. Sed varius turpis vitae pede. Lorem ipsum"
</span><span class="cx"> text run at (0,180) width 275: "dolor sit amet, consectetuer adipiscing elit."
</span><del>- RenderBlock {P} at (0,230) size 367x198
- RenderText {#text} at (0,0) size 367x198
</del><ins>+ RenderBlock {P} at (0,230) size 367x207
+ RenderText {#text} at (0,0) size 367x207
</ins><span class="cx"> text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
</span><span class="cx"> text run at (0,18) width 362: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
</span><span class="cx"> text run at (0,36) width 332: "lectus. Quisque adipiscing rhoncus sem. Proin nulla"
</span><span class="cx"> text run at (0,54) width 367: "purus, vulputate vel, varius ut, euismod et, nisi. Sed vitae"
</span><span class="cx"> text run at (0,72) width 354: "felis vel orci sagittis aliquam. Cras convallis adipiscing"
</span><del>- text run at (0,90) width 347: "sem. Nam nonummy enim. Nullam bibendum lobortis"
- text run at (0,108) width 351: "neque. Vestibulum velit orci, tempus euismod, pretium"
- text run at (0,126) width 353: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
- text run at (0,144) width 351: "condimentum vestibulum. Suspendisse hendrerit quam"
- text run at (0,162) width 333: "nec felis. Sed varius turpis vitae pede. Lorem ipsum"
- text run at (0,180) width 275: "dolor sit amet, consectetuer adipiscing elit."
- RenderBlock {P} at (0,444) size 367x198
</del><ins>+ text run at (0,99) width 347: "sem. Nam nonummy enim. Nullam bibendum lobortis"
+ text run at (0,117) width 351: "neque. Vestibulum velit orci, tempus euismod, pretium"
+ text run at (0,135) width 353: "quis, interdum vitae, nulla. Phasellus eget ante et tortor"
+ text run at (0,153) width 351: "condimentum vestibulum. Suspendisse hendrerit quam"
+ text run at (0,171) width 333: "nec felis. Sed varius turpis vitae pede. Lorem ipsum"
+ text run at (0,189) width 275: "dolor sit amet, consectetuer adipiscing elit."
+ RenderBlock {P} at (0,453) size 367x198
</ins><span class="cx"> RenderText {#text} at (0,0) size 367x198
</span><span class="cx"> text run at (0,0) width 364: "Lorem ipsum dolor sit amet, consectetuer adipiscing elit."
</span><span class="cx"> text run at (0,18) width 362: "Nulla varius enim ac mi. Curabitur sollicitudin felis quis"
</span><span class="lines">@@ -349,15 +349,15 @@
</span><span class="cx"> text run at (0,162) width 333: "nec felis. Sed varius turpis vitae pede. Lorem ipsum"
</span><span class="cx"> text run at (0,180) width 275: "dolor sit amet, consectetuer adipiscing elit."
</span><span class="cx"> RenderMultiColumnSpannerPlaceholder at (0,658) size 0x0
</span><del>-layer at (8,2971) size 760x452
- RenderBlock {DIV} at (0,2955) size 760x452 [border: (5px solid #800000)]
</del><ins>+layer at (8,2962) size 760x452
+ RenderBlock {DIV} at (0,2946) size 760x452 [border: (5px solid #800000)]
</ins><span class="cx"> RenderMultiColumnSet at (5,5) size 750x222
</span><span class="cx"> RenderBlock {H2} at (5,246) size 750x57 [bgcolor=#EEEEEE]
</span><span class="cx"> RenderText {#text} at (0,0) size 743x56
</span><span class="cx"> text run at (0,0) width 743: "This is a spanning element in the middle of the columns block with block"
</span><span class="cx"> text run at (0,28) width 84: "siblings."
</span><span class="cx"> RenderMultiColumnSet at (5,322) size 750x125
</span><del>-layer at (13,2976) size 367x666 backgroundClip at (0,0) size 785x3439 clip at (0,0) size 785x3439 outlineClip at (0,0) size 785x3439
</del><ins>+layer at (13,2967) size 367x666 backgroundClip at (0,0) size 785x3430 clip at (0,0) size 785x3430 outlineClip at (0,0) size 785x3430
</ins><span class="cx"> RenderMultiColumnFlowThread at (5,5) size 367x666
</span><span class="cx"> RenderBlock {P} at (0,16) size 367x198
</span><span class="cx"> RenderText {#text} at (0,0) size 367x198
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (180363 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-02-19 21:38:09 UTC (rev 180363)
+++ trunk/Source/WebCore/ChangeLog        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-02-19 David Hyatt <hyatt@apple.com>
+
+ Columns are splitting unsplittable content.
+ https://bugs.webkit.org/show_bug.cgi?id=141807
+ <rdar://problem/18387659>
+
+ Reviewed by Dean Jackson.
+
+ Added inline-table-dynamic-movement.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::pageLogicalTopForOffset):
+ (WebCore::RenderBlockFlow::pageLogicalHeightForOffset):
+ Patch these functions to always check the layout state for a zero
+ pageLogicalHeight, since that is actually our indicator that we're
+ doing column balancing and don't have a height set yet.
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::RenderMultiColumnFlowThread::isPageLogicalHeightKnown):
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::RenderMultiColumnSet):
+ (WebCore::RenderMultiColumnSet::setAndConstrainColumnHeight):
+ (WebCore::RenderMultiColumnSet::prepareForLayout):
+ * rendering/RenderMultiColumnSet.h:
+ The function for deciding whether the logical height of the columns was
+ known was checking for a zero computedColumnHeight. However, a column set
+ can legitimately compute a zero column height, and with the fix to examine
+ the layout state, this bug was exposed.
+
+ The fix is to add a new variable that caches whether or not the column height
+ has been computed, so that even if it computes to zero, we aren't fooled.
+
</ins><span class="cx"> 2015-02-19 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix inefficiencies in ResourceResponse::platformLazyInit()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (180363 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp        2015-02-19 21:38:09 UTC (rev 180363)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -1850,25 +1850,34 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBlockFlow::pageLogicalTopForOffset(LayoutUnit offset) const
</span><span class="cx"> {
</span><ins>+ // Unsplittable objects clear out the pageLogicalHeight in the layout state as a way of signaling that no
+ // pagination should occur. Therefore we have to check this first and bail if the value has been set to 0.
+ LayoutUnit pageLogicalHeight = view().layoutState()->m_pageLogicalHeight;
+ if (!pageLogicalHeight)
+ return 0;
+
</ins><span class="cx"> LayoutUnit firstPageLogicalTop = isHorizontalWritingMode() ? view().layoutState()->m_pageOffset.height() : view().layoutState()->m_pageOffset.width();
</span><span class="cx"> LayoutUnit blockLogicalTop = isHorizontalWritingMode() ? view().layoutState()->m_layoutOffset.height() : view().layoutState()->m_layoutOffset.width();
</span><span class="cx">
</span><span class="cx"> LayoutUnit cumulativeOffset = offset + blockLogicalTop;
</span><span class="cx"> RenderFlowThread* flowThread = flowThreadContainingBlock();
</span><del>- if (!flowThread) {
- LayoutUnit pageLogicalHeight = view().layoutState()->pageLogicalHeight();
- if (!pageLogicalHeight)
- return 0;
</del><ins>+ if (!flowThread)
</ins><span class="cx"> return cumulativeOffset - roundToInt(cumulativeOffset - firstPageLogicalTop) % roundToInt(pageLogicalHeight);
</span><del>- }
</del><span class="cx"> return firstPageLogicalTop + flowThread->pageLogicalTopForOffset(cumulativeOffset - firstPageLogicalTop);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBlockFlow::pageLogicalHeightForOffset(LayoutUnit offset) const
</span><span class="cx"> {
</span><ins>+ // Unsplittable objects clear out the pageLogicalHeight in the layout state as a way of signaling that no
+ // pagination should occur. Therefore we have to check this first and bail if the value has been set to 0.
+ LayoutUnit pageLogicalHeight = view().layoutState()->m_pageLogicalHeight;
+ if (!pageLogicalHeight)
+ return 0;
+
+ // Now check for a flow thread.
</ins><span class="cx"> RenderFlowThread* flowThread = flowThreadContainingBlock();
</span><span class="cx"> if (!flowThread)
</span><del>- return view().layoutState()->m_pageLogicalHeight;
</del><ins>+ return pageLogicalHeight;
</ins><span class="cx"> return flowThread->pageLogicalHeightForOffset(offset + offsetFromLogicalTopOfFirstPage());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (180363 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp        2015-02-19 21:38:09 UTC (rev 180363)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -729,7 +729,7 @@
</span><span class="cx"> bool RenderMultiColumnFlowThread::isPageLogicalHeightKnown() const
</span><span class="cx"> {
</span><span class="cx"> if (RenderMultiColumnSet* columnSet = lastMultiColumnSet())
</span><del>- return columnSet->computedColumnHeight();
</del><ins>+ return columnSet->columnHeightComputed();
</ins><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp (180363 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp        2015-02-19 21:38:09 UTC (rev 180363)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.cpp        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -42,6 +42,7 @@
</span><span class="cx"> , m_computedColumnWidth(0)
</span><span class="cx"> , m_computedColumnHeight(0)
</span><span class="cx"> , m_availableColumnHeight(0)
</span><ins>+ , m_columnHeightComputed(false)
</ins><span class="cx"> , m_maxColumnHeight(RenderFlowThread::maxLogicalHeight())
</span><span class="cx"> , m_minSpaceShortage(RenderFlowThread::maxLogicalHeight())
</span><span class="cx"> , m_minimumColumnHeight(0)
</span><span class="lines">@@ -168,6 +169,9 @@
</span><span class="cx"> if (pageLength)
</span><span class="cx"> m_computedColumnHeight = pageLength;
</span><span class="cx"> }
</span><ins>+
+ m_columnHeightComputed = true;
+
</ins><span class="cx"> // FIXME: the height may also be affected by the enclosing pagination context, if any.
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -341,6 +345,7 @@
</span><span class="cx"> if (initial) {
</span><span class="cx"> m_computedColumnHeight = 0;
</span><span class="cx"> m_availableColumnHeight = 0;
</span><ins>+ m_columnHeightComputed = false;
</ins><span class="cx"> }
</span><span class="cx"> } else
</span><span class="cx"> setAndConstrainColumnHeight(heightAdjustedForSetOffset(multiColumnFlowThread()->columnHeightAvailable()));
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMultiColumnSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMultiColumnSet.h (180363 => 180364)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMultiColumnSet.h        2015-02-19 21:38:09 UTC (rev 180363)
+++ trunk/Source/WebCore/rendering/RenderMultiColumnSet.h        2015-02-19 21:42:21 UTC (rev 180364)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx"> unsigned computedColumnCount() const { return m_computedColumnCount; }
</span><span class="cx"> LayoutUnit computedColumnWidth() const { return m_computedColumnWidth; }
</span><span class="cx"> LayoutUnit computedColumnHeight() const { return m_computedColumnHeight; }
</span><ins>+ bool columnHeightComputed() const { return m_columnHeightComputed; }
</ins><span class="cx">
</span><span class="cx"> void setComputedColumnWidthAndCount(LayoutUnit width, unsigned count)
</span><span class="cx"> {
</span><span class="lines">@@ -191,7 +192,8 @@
</span><span class="cx"> LayoutUnit m_computedColumnWidth; // Used column width (the resulting 'W' from the pseudo-algorithm in the multicol spec)
</span><span class="cx"> LayoutUnit m_computedColumnHeight;
</span><span class="cx"> LayoutUnit m_availableColumnHeight;
</span><del>-
</del><ins>+ bool m_columnHeightComputed;
+
</ins><span class="cx"> // The following variables are used when balancing the column set.
</span><span class="cx"> LayoutUnit m_maxColumnHeight; // Maximum column height allowed.
</span><span class="cx"> LayoutUnit m_minSpaceShortage; // The smallest amout of space shortage that caused a column break.
</span></span></pre>
</div>
</div>
</body>
</html>