<!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>[164649] 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/164649">164649</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-02-25 08:10:08 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[New Multicolumn] -webkit-column-break-inside:avoid doesn't work
https://bugs.webkit.org/show_bug.cgi?id=129299
Patch by Morten Stenshorne <mstensho@opera.com> on 2014-02-25
Reviewed by Andrei Bucur.
Source/WebCore:
adjustForUnsplittableChild() simply forgot to check whether we
were inside flow thread based multicol.
Test: fast/multicol/newmulticol/avoid-column-break-inside.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::adjustForUnsplittableChild):
LayoutTests:
* fast/multicol/newmulticol/avoid-column-break-inside-expected.html: Added.
* fast/multicol/newmulticol/avoid-column-break-inside.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="#trunkSourceWebCorerenderingRenderBlockFlowcpp">trunk/Source/WebCore/rendering/RenderBlockFlow.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolavoidcolumnbreakinsideexpectedhtml">trunk/LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolavoidcolumnbreakinsidehtml">trunk/LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164648 => 164649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-25 15:08:18 UTC (rev 164648)
+++ trunk/LayoutTests/ChangeLog 2014-02-25 16:10:08 UTC (rev 164649)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-25 Morten Stenshorne <mstensho@opera.com>
+
+ [New Multicolumn] -webkit-column-break-inside:avoid doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=129299
+
+ Reviewed by Andrei Bucur.
+
+ * fast/multicol/newmulticol/avoid-column-break-inside-expected.html: Added.
+ * fast/multicol/newmulticol/avoid-column-break-inside.html: Added.
+
</ins><span class="cx"> 2014-02-25 Grzegorz Czajkowski <g.czajkowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> Refactoring inline_spelling_markers.html to use asynchronous spellchecking
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolavoidcolumnbreakinsideexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside-expected.html (0 => 164649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside-expected.html 2014-02-25 16:10:08 UTC (rev 164649)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Avoid column break inside block</title>
+ </head>
+ <body>
+ <p>There should be a blue square below.</p>
+ <div style="width:100px; height:100px; background:blue;"></div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolavoidcolumnbreakinsidehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside.html (0 => 164649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/avoid-column-break-inside.html 2014-02-25 16:10:08 UTC (rev 164649)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Avoid column break inside block</title>
+ <script>
+ if (window.internals)
+ internals.settings.setRegionBasedColumnsEnabled(true);
+ </script>
+ </head>
+ <body>
+ <p>There should be a blue square below.</p>
+ <div style="-webkit-columns:4; columns:4;">
+ <div style="width:100px; height:100px; -webkit-column-break-inside:avoid; break-inside:avoid; background:blue;"></div>
+ </div>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (164648 => 164649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-25 15:08:18 UTC (rev 164648)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 16:10:08 UTC (rev 164649)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-25 Morten Stenshorne <mstensho@opera.com>
+
+ [New Multicolumn] -webkit-column-break-inside:avoid doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=129299
+
+ Reviewed by Andrei Bucur.
+
+ adjustForUnsplittableChild() simply forgot to check whether we
+ were inside flow thread based multicol.
+
+ Test: fast/multicol/newmulticol/avoid-column-break-inside.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::adjustForUnsplittableChild):
+
</ins><span class="cx"> 2014-02-25 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSSRegions] Remove unused function RenderFlowThread::regionForCompositedLayer
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (164648 => 164649)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-02-25 15:08:18 UTC (rev 164648)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-02-25 16:10:08 UTC (rev 164649)
</span><span class="lines">@@ -1692,9 +1692,10 @@
</span><span class="cx">
</span><span class="cx"> LayoutUnit RenderBlockFlow::adjustForUnsplittableChild(RenderBox& child, LayoutUnit logicalOffset, bool includeMargins)
</span><span class="cx"> {
</span><del>- bool checkColumnBreaks = view().layoutState()->isPaginatingColumns();
</del><ins>+ RenderFlowThread* flowThread = flowThreadContainingBlock();
+ bool isInsideMulticolFlowThread = flowThread && !flowThread->isRenderNamedFlowThread();
+ bool checkColumnBreaks = isInsideMulticolFlowThread || view().layoutState()->isPaginatingColumns();
</ins><span class="cx"> bool checkPageBreaks = !checkColumnBreaks && view().layoutState()->m_pageLogicalHeight;
</span><del>- RenderFlowThread* flowThread = flowThreadContainingBlock();
</del><span class="cx"> bool checkRegionBreaks = flowThread && flowThread->isRenderNamedFlowThread();
</span><span class="cx"> bool isUnsplittable = child.isUnsplittableForPagination() || (checkColumnBreaks && child.style().columnBreakInside() == PBAVOID)
</span><span class="cx"> || (checkPageBreaks && child.style().pageBreakInside() == PBAVOID)
</span></span></pre>
</div>
</div>
</body>
</html>