<!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>[169425] 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/169425">169425</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-05-28 09:38:57 -0700 (Wed, 28 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/168046">r168046</a>): Invalid layout in multicol
https://bugs.webkit.org/show_bug.cgi?id=133322
Reviewed by Antti Koivisto.
Source/WebCore:
In some situations, deleting the line boxes of a multicol element causes the line to region
link to become invalid.
Test: fast/multicol/newmulticol/multicol-inside-multicol.html
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::clearLinesToRegionMap):
(WebCore::RenderFlowThread::deleteLines):
(WebCore::RenderFlowThread::willBeDestroyed):
* rendering/RenderFlowThread.h:
LayoutTests:
* fast/multicol/newmulticol/multicol-inside-multicol-expected.html: Added.
* fast/multicol/newmulticol/multicol-inside-multicol.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolmulticolinsidemulticolexpectedhtml">trunk/LayoutTests/fast/multicol/newmulticol/multicol-inside-multicol-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnewmulticolmulticolinsidemulticolhtml">trunk/LayoutTests/fast/multicol/newmulticol/multicol-inside-multicol.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (169424 => 169425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-05-28 16:22:15 UTC (rev 169424)
+++ trunk/LayoutTests/ChangeLog 2014-05-28 16:38:57 UTC (rev 169425)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-05-28 Radu Stavila <stavila@adobe.com>
+
+ REGRESSION (r168046): Invalid layout in multicol
+ https://bugs.webkit.org/show_bug.cgi?id=133322
+
+ Reviewed by Antti Koivisto.
+
+ * fast/multicol/newmulticol/multicol-inside-multicol-expected.html: Added.
+ * fast/multicol/newmulticol/multicol-inside-multicol.html: Added.
+
</ins><span class="cx"> 2014-05-27 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r169400.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolmulticolinsidemulticolexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/multicol-inside-multicol-expected.html (0 => 169425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/multicol-inside-multicol-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/multicol-inside-multicol-expected.html 2014-05-28 16:38:57 UTC (rev 169425)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<!-- This test passes if it doesn't crash - https://bugs.webkit.org/show_bug.cgi?id=133322 -->
+
+<body>
+</body>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnewmulticolmulticolinsidemulticolhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/newmulticol/multicol-inside-multicol.html (0 => 169425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/newmulticol/multicol-inside-multicol.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/newmulticol/multicol-inside-multicol.html 2014-05-28 16:38:57 UTC (rev 169425)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<style>
+ div.test { -webkit-column-width: 100px; }
+ div.test > div { -webkit-logical-height: 100%; }
+</style>
+<div id="outerdiv" class="test">
+ <div id="innerdiv"></div><div></div>
+</div>
+<script>
+document.execCommand("SelectAll");
+for (i=0;i<5;i++) {
+var canvas = document.createElement("canvas");
+document.getElementById("innerdiv").insertBefore(canvas, document.getElementById("innerdiv").appendChild(document.createElement("strong")));
+var ctx = canvas.getContext("2d");
+ctx.createImageData(1024, 65534);
+}
+</script>
+<script>
+head = document.getElementsByTagName("head")[0];
+var style = document.createElement("style");
+var rule = document.createTextNode("* { position: absolute;");
+style.appendChild(rule);
+head.appendChild(style);
+var elem = document.getElementById("outerdiv");
+elem.parentNode.removeChild(elem);
+</script>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169424 => 169425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-28 16:22:15 UTC (rev 169424)
+++ trunk/Source/WebCore/ChangeLog 2014-05-28 16:38:57 UTC (rev 169425)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-05-28 Radu Stavila <stavila@adobe.com>
+
+ REGRESSION (r168046): Invalid layout in multicol
+ https://bugs.webkit.org/show_bug.cgi?id=133322
+
+ Reviewed by Antti Koivisto.
+
+ In some situations, deleting the line boxes of a multicol element causes the line to region
+ link to become invalid.
+
+ Test: fast/multicol/newmulticol/multicol-inside-multicol.html
+
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::clearLinesToRegionMap):
+ (WebCore::RenderFlowThread::deleteLines):
+ (WebCore::RenderFlowThread::willBeDestroyed):
+ * rendering/RenderFlowThread.h:
+
</ins><span class="cx"> 2014-05-28 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove DocumentThreadableLoaderClient.h
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (169424 => 169425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-05-28 16:22:15 UTC (rev 169424)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-05-28 16:38:57 UTC (rev 169425)
</span><span class="lines">@@ -959,14 +959,24 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void RenderFlowThread::deleteLines()
</del><ins>+void RenderFlowThread::clearLinesToRegionMap()
</ins><span class="cx"> {
</span><span class="cx"> if (m_lineToRegionMap)
</span><span class="cx"> m_lineToRegionMap->clear();
</span><ins>+}
</ins><span class="cx">
</span><ins>+void RenderFlowThread::deleteLines()
+{
+ clearLinesToRegionMap();
</ins><span class="cx"> RenderBlockFlow::deleteLines();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void RenderFlowThread::willBeDestroyed()
+{
+ clearLinesToRegionMap();
+ RenderBlockFlow::willBeDestroyed();
+}
+
</ins><span class="cx"> // During the measure content layout phase of the named flow the regions are initialized with a height equal to their max-height.
</span><span class="cx"> // This way unforced breaks are automatically placed when a region is full and the content height/position correctly estimated.
</span><span class="cx"> // Also, the region where a forced break falls is exactly the region found at the forced break offset inside the flow content.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.h (169424 => 169425)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-05-28 16:22:15 UTC (rev 169424)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.h 2014-05-28 16:38:57 UTC (rev 169425)
</span><span class="lines">@@ -254,6 +254,9 @@
</span><span class="cx"> // Overridden by columns/pages to set up an initial logical width of the page width even when
</span><span class="cx"> // no regions have been generated yet.
</span><span class="cx"> virtual LayoutUnit initialLogicalWidth() const { return 0; };
</span><ins>+
+ void clearLinesToRegionMap();
+ virtual void willBeDestroyed() override;
</ins><span class="cx">
</span><span class="cx"> virtual void mapLocalToContainer(const RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const override;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>