<!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>[171849] 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/171849">171849</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-07-31 06:43:52 -0700 (Thu, 31 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>2014-07-31 Andrei Bucur <abucur@adobe.com>
[CSS Multicolumn] Clear the lines when switching to multi-column layout
https://bugs.webkit.org/show_bug.cgi?id=135127
Reviewed by Alexandru Chiculita.
Source/WebCore:
When switching an element to multi-column layout it becomes a container of block
children. When this happens the existing line boxes must be deleted in addition
to clearing the hasInlineChildren flag.
Tests: fast/multicol/inline-container-to-multicol.html
fast/multicol/inline-container-to-multicol-float.html
fast/multicol/inline-container-to-multicol-positioned.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::createMultiColumnFlowThread):
LayoutTests:
Tests that verifies lines are correctly cleared when an element is switched to
multi-column layout.
* fast/multicol/inline-container-to-multicol-expected.txt: Added.
* fast/multicol/inline-container-to-multicol.html: Added.
* fast/multicol/inline-container-to-multicol-float-expected.txt: Added.
* fast/multicol/inline-container-to-multicol-float.html: Added.
* fast/multicol/inline-container-to-multicol-positioned-expected.txt: Added.
* fast/multicol/inline-container-to-multicol-positioned.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="#trunkLayoutTestsfastmulticolinlinecontainertomulticolexpectedtxt">trunk/LayoutTests/fast/multicol/inline-container-to-multicol-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolinlinecontainertomulticolfloatexpectedtxt">trunk/LayoutTests/fast/multicol/inline-container-to-multicol-float-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolinlinecontainertomulticolfloathtml">trunk/LayoutTests/fast/multicol/inline-container-to-multicol-float.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolinlinecontainertomulticolpositionedexpectedtxt">trunk/LayoutTests/fast/multicol/inline-container-to-multicol-positioned-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolinlinecontainertomulticolpositionedhtml">trunk/LayoutTests/fast/multicol/inline-container-to-multicol-positioned.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolinlinecontainertomulticolhtml">trunk/LayoutTests/fast/multicol/inline-container-to-multicol.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (171848 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-07-31 13:18:24 UTC (rev 171848)
+++ trunk/LayoutTests/ChangeLog 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-07-31 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Multicolumn] Clear the lines when switching to multi-column layout
+ https://bugs.webkit.org/show_bug.cgi?id=135127
+
+ Reviewed by Alexandru Chiculita.
+
+ Tests that verifies lines are correctly cleared when an element is switched to
+ multi-column layout.
+
+ * fast/multicol/inline-container-to-multicol-expected.txt: Added.
+ * fast/multicol/inline-container-to-multicol.html: Added.
+ * fast/multicol/inline-container-to-multicol-float-expected.txt: Added.
+ * fast/multicol/inline-container-to-multicol-float.html: Added.
+ * fast/multicol/inline-container-to-multicol-positioned-expected.txt: Added.
+ * fast/multicol/inline-container-to-multicol-positioned.html: Added.
+
</ins><span class="cx"> 2014-07-30 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a layout test for Geolocation's request queueing for hidden pages
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolinlinecontainertomulticolexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/inline-container-to-multicol-expected.txt (0 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/inline-container-to-multicol-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/inline-container-to-multicol-expected.txt 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+b135127: The test passes if it doesn't hang or crash
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolinlinecontainertomulticolfloatexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/inline-container-to-multicol-float-expected.txt (0 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/inline-container-to-multicol-float-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/inline-container-to-multicol-float-expected.txt 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+b135127: The test passes if it doesn't hang or crash
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolinlinecontainertomulticolfloathtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/inline-container-to-multicol-float.html (0 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/inline-container-to-multicol-float.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/inline-container-to-multicol-float.html 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style type="text/css">
+ #multicol {
+ border: thin solid green;
+ height: 300px;
+ width: 200px;
+ text-align: justify;
+ }
+
+ #multicol.has-first-letter::first-letter {
+ color: red;
+ font-size: 10px;
+ }
+
+ #float {
+ float: left;
+ width: 20px;
+ height: 10px;
+ background: blue;
+ }
+ </style>
+</head>
+<body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=135127">b135127</a>: The test passes if it doesn't hang or crash</p>
+ <div id="multicol" class="has-first-letter">
+ Text text text text text text text text <div id="float">A</div>Text text text text Text text text text Text text text text text text text text
+ </div>
+ <script type="text/javascript">
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ var multicolElement = document.getElementById("multicol");
+ var floatElement = document.getElementById("float");
+
+ document.body.offsetTop;
+
+ multicolElement.style.webkitColumnCount = "2";
+ document.body.offsetTop;
+
+ multicolElement.style.webkitColumnCount = "auto";
+ document.body.offsetLeft;
+
+ multicolElement.className = "";
+ document.body.offsetLeft;
+
+ multicolElement.remove();
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolinlinecontainertomulticolpositionedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/inline-container-to-multicol-positioned-expected.txt (0 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/inline-container-to-multicol-positioned-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/inline-container-to-multicol-positioned-expected.txt 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+b135127: The test passes if it doesn't hang or crash
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolinlinecontainertomulticolpositionedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/inline-container-to-multicol-positioned.html (0 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/inline-container-to-multicol-positioned.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/inline-container-to-multicol-positioned.html 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style type="text/css">
+ #multicol {
+ border: thin solid green;
+ height: 300px;
+ width: 200px;
+ text-align: justify;
+ position: relative;
+ }
+
+ #positioned {
+ position: absolute;
+ }
+ </style>
+</head>
+<body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=135127">b135127</a>: The test passes if it doesn't hang or crash</p>
+ <div id="multicol">
+ Text text text text text text text text <span id="positioned">Text text text text Text text text text</span>Text text text text Text text text text Text text text text text text text text
+ </div>
+ <script type="text/javascript">
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ var multicolElement = document.getElementById("multicol");
+
+ document.body.offsetTop;
+
+ multicolElement.style.webkitColumnCount = "2";
+ document.body.offsetTop;
+
+ multicolElement.style.webkitColumnCount = "auto";
+ document.body.offsetLeft;
+
+ multicolElement.remove();
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolinlinecontainertomulticolhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/inline-container-to-multicol.html (0 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/inline-container-to-multicol.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/inline-container-to-multicol.html 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <style type="text/css">
+ #multicol {
+ border: thin solid green;
+ height: 300px;
+ width: 200px;
+ text-align: justify;
+ }
+ </style>
+</head>
+<body>
+ <p><a href="https://bugs.webkit.org/show_bug.cgi?id=135127">b135127</a>: The test passes if it doesn't hang or crash</p>
+ <div id="multicol">
+ <div id="remove">A</div>Text text text text text text text text <div id="remove2">A</div>Text text text text Text text text text Text text text text text text text text
+ </div>
+ <script type="text/javascript">
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ var multicolElement = document.getElementById("multicol");
+ var removeElement = document.getElementById("remove");
+ var removeElement2 = document.getElementById("remove2");
+
+ removeElement.remove();
+ removeElement2.remove();
+ document.body.offsetTop;
+
+ multicolElement.style.webkitColumnCount = "2";
+ document.body.offsetTop;
+
+ multicolElement.appendChild(removeElement);
+ multicolElement.appendChild(removeElement2);
+ document.body.offsetLeft;
+ multicolElement.style.webkitColumnCount = "auto";
+ document.body.offsetLeft;
+
+ multicolElement.remove();
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (171848 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-31 13:18:24 UTC (rev 171848)
+++ trunk/Source/WebCore/ChangeLog 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-07-31 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Multicolumn] Clear the lines when switching to multi-column layout
+ https://bugs.webkit.org/show_bug.cgi?id=135127
+
+ Reviewed by Alexandru Chiculita.
+
+ When switching an element to multi-column layout it becomes a container of block
+ children. When this happens the existing line boxes must be deleted in addition
+ to clearing the hasInlineChildren flag.
+
+ Tests: fast/multicol/inline-container-to-multicol.html
+ fast/multicol/inline-container-to-multicol-float.html
+ fast/multicol/inline-container-to-multicol-positioned.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::createMultiColumnFlowThread):
+
</ins><span class="cx"> 2014-07-30 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> PropertyName's internal string is always atomic.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (171848 => 171849)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-07-31 13:18:24 UTC (rev 171848)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2014-07-31 13:43:52 UTC (rev 171849)
</span><span class="lines">@@ -121,6 +121,7 @@
</span><span class="cx"> RenderMultiColumnFlowThread* flowThread = new RenderMultiColumnFlowThread(document(), RenderStyle::createAnonymousStyleWithDisplay(&style(), BLOCK));
</span><span class="cx"> flowThread->initializeStyle();
</span><span class="cx"> setChildrenInline(false); // Do this to avoid wrapping inline children that are just going to move into the flow thread.
</span><ins>+ deleteLines();
</ins><span class="cx"> RenderBlock::addChild(flowThread);
</span><span class="cx"> flowThread->populate(); // Called after the flow thread is inserted so that we are reachable by the flow thread.
</span><span class="cx"> setMultiColumnFlowThread(flowThread);
</span></span></pre>
</div>
</div>
</body>
</html>