<!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>[173915] releases/WebKitGTK/webkit-2.6</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/173915">173915</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-09-24 06:35:09 -0700 (Wed, 24 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/173843">r173843</a> - ASSERT in RenderMultiColumnSet::requiresBalancing.
https://bugs.webkit.org/show_bug.cgi?id=136376.
Reviewed by David Kilzer.
Source/WebCore:
Added fast/multicol/multicol-selection.html.
* rendering/RenderMultiColumnFlowThread.cpp:
(WebCore::isValidColumnSpanner):
Don't allow an object to become a spanner if it does not have the flow
thread as its containing block. Otherwise the flow thread won't get notified
of spanner placeholder insertions, and so the spanner ends up orphaned.
LayoutTests:
* fast/multicol/multicol-selection-expected.txt: Added.
* fast/multicol/multicol-selection.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26SourceWebCorerenderingRenderMultiColumnFlowThreadcpp">releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastmulticolmulticolselectionexpectedtxt">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-selection-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26LayoutTestsfastmulticolmulticolselectionhtml">releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-selection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog (173914 => 173915)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-09-24 13:33:45 UTC (rev 173914)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/ChangeLog 2014-09-24 13:35:09 UTC (rev 173915)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-09-22 David Hyatt <hyatt@apple.com>
+
+ ASSERT in RenderMultiColumnSet::requiresBalancing.
+ https://bugs.webkit.org/show_bug.cgi?id=136376.
+
+ Reviewed by David Kilzer.
+
+ * fast/multicol/multicol-selection-expected.txt: Added.
+ * fast/multicol/multicol-selection.html: Added.
+
</ins><span class="cx"> 2014-09-22 Mihnea Ovidenie <mihnea@adobe.com>
</span><span class="cx">
</span><span class="cx"> [CSS Regions] Assertion failure and null dereference crash when using animations and regions
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastmulticolmulticolselectionexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-selection-expected.txt (0 => 173915)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-selection-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-selection-expected.txt 2014-09-24 13:35:09 UTC (rev 173915)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+This test passes if it doesn't crash.
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26LayoutTestsfastmulticolmulticolselectionhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-selection.html (0 => 173915)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-selection.html (rev 0)
+++ releases/WebKitGTK/webkit-2.6/LayoutTests/fast/multicol/multicol-selection.html 2014-09-24 13:35:09 UTC (rev 173915)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+This test passes if it doesn't crash.
+<style id="style">
+#elm::before, #elm::after { display:block; -webkit-column-span:all; content:".........."; }
+:last-of-type { position: absolute;}
+</style>
+<div id="div" style="visibility:hidden; -webkit-columns:4; columns:4;">
+ <span id="elm">&nbsp;</span>
+</div>
+<script>
+document.execCommand("SelectAll");
+var elem = document.getElementById("style");
+elem.innerHTML="%a%b3%bf%5c";
+</script>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog (173914 => 173915)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-24 13:33:45 UTC (rev 173914)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/ChangeLog 2014-09-24 13:35:09 UTC (rev 173915)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-09-22 David Hyatt <hyatt@apple.com>
+
+ ASSERT in RenderMultiColumnSet::requiresBalancing.
+ https://bugs.webkit.org/show_bug.cgi?id=136376.
+
+ Reviewed by David Kilzer.
+
+ Added fast/multicol/multicol-selection.html.
+
+ * rendering/RenderMultiColumnFlowThread.cpp:
+ (WebCore::isValidColumnSpanner):
+ Don't allow an object to become a spanner if it does not have the flow
+ thread as its containing block. Otherwise the flow thread won't get notified
+ of spanner placeholder insertions, and so the spanner ends up orphaned.
+
</ins><span class="cx"> 2014-09-22 Eva Balazsfalvi <evab.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r173631): It broke the !ENABLE(VIDEO) build
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26SourceWebCorerenderingRenderMultiColumnFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp (173914 => 173915)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-09-24 13:33:45 UTC (rev 173914)
+++ releases/WebKitGTK/webkit-2.6/Source/WebCore/rendering/RenderMultiColumnFlowThread.cpp 2014-09-24 13:35:09 UTC (rev 173915)
</span><span class="lines">@@ -257,6 +257,11 @@
</span><span class="cx"> // Needs to be block-level.
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+ // We need to have the flow thread as the containing block. A spanner cannot break out of the flow thread.
+ RenderFlowThread* enclosingFlowThread = descendant->flowThreadContainingBlock();
+ if (enclosingFlowThread != flowThread)
+ return false;
</ins><span class="cx">
</span><span class="cx"> // This looks like a spanner, but if we're inside something unbreakable, it's not to be treated as one.
</span><span class="cx"> for (RenderBox* ancestor = toRenderBox(descendant)->parentBox(); ancestor; ancestor = ancestor->parentBox()) {
</span></span></pre>
</div>
</div>
</body>
</html>