<!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>[209546] 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/209546">209546</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-12-08 10:20:01 -0800 (Thu, 08 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do not create multicolumn context for certain type of renderers.
https://bugs.webkit.org/show_bug.cgi?id=135601
<rdar://problem/27686300>
Reviewed by David Hyatt.
Source/WebCore:
Certain type of renderers including forms should not initialize multicolumn context for
their inner (shadow) content. It just does not makes sense and is inline with what other browsers do.
Test: fast/multicol/no-multicol-for-textareas.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::willCreateColumns):
(WebCore::RenderBlockFlow::requiresColumns):
* rendering/RenderBlockFlow.h:
LayoutTests:
* fast/multicol/no-multicol-for-textareas-expected.txt: Added.
* fast/multicol/no-multicol-for-textareas.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>
<li><a href="#trunkSourceWebCorerenderingRenderBlockFlowh">trunk/Source/WebCore/rendering/RenderBlockFlow.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolnomulticolfortextareasexpectedtxt">trunk/LayoutTests/fast/multicol/no-multicol-for-textareas-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmulticolnomulticolfortextareashtml">trunk/LayoutTests/fast/multicol/no-multicol-for-textareas.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209545 => 209546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-08 18:19:14 UTC (rev 209545)
+++ trunk/LayoutTests/ChangeLog 2016-12-08 18:20:01 UTC (rev 209546)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-12-08 Zalan Bujtas <zalan@apple.com>
+
+ Do not create multicolumn context for certain type of renderers.
+ https://bugs.webkit.org/show_bug.cgi?id=135601
+ <rdar://problem/27686300>
+
+ Reviewed by David Hyatt.
+
+ * fast/multicol/no-multicol-for-textareas-expected.txt: Added.
+ * fast/multicol/no-multicol-for-textareas.html: Added.
+
</ins><span class="cx"> 2016-12-08 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] Unskip more tests
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnomulticolfortextareasexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/no-multicol-for-textareas-expected.txt (0 => 209546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/no-multicol-for-textareas-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/multicol/no-multicol-for-textareas-expected.txt 2016-12-08 18:20:01 UTC (rev 209546)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no assert in debug.
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolnomulticolfortextareashtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/no-multicol-for-textareas.html (0 => 209546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/no-multicol-for-textareas.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/no-multicol-for-textareas.html 2016-12-08 18:20:01 UTC (rev 209546)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we don't create multicolumn content for textareas</title>
+<style>
+textarea {
+ columns: 2;
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.
+<textarea placeholder="foobar"></textarea>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209545 => 209546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-08 18:19:14 UTC (rev 209545)
+++ trunk/Source/WebCore/ChangeLog 2016-12-08 18:20:01 UTC (rev 209546)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-12-08 Zalan Bujtas <zalan@apple.com>
+
+ Do not create multicolumn context for certain type of renderers.
+ https://bugs.webkit.org/show_bug.cgi?id=135601
+ <rdar://problem/27686300>
+
+ Reviewed by David Hyatt.
+
+ Certain type of renderers including forms should not initialize multicolumn context for
+ their inner (shadow) content. It just does not makes sense and is inline with what other browsers do.
+
+ Test: fast/multicol/no-multicol-for-textareas.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::willCreateColumns):
+ (WebCore::RenderBlockFlow::requiresColumns):
+ * rendering/RenderBlockFlow.h:
+
</ins><span class="cx"> 2016-12-08 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> [CSS Parser] REGRESSION: Values of 0 should not be allowed for -webkit-aspect-ratio
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (209545 => 209546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-12-08 18:19:14 UTC (rev 209545)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2016-12-08 18:20:01 UTC (rev 209546)
</span><span class="lines">@@ -428,15 +428,23 @@
</span><span class="cx"> setComputedColumnCountAndWidth(desiredColumnCount, desiredColumnWidth);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderBlockFlow::willCreateColumns()
</del><ins>+bool RenderBlockFlow::willCreateColumns(std::optional<unsigned> desiredColumnCount) const
</ins><span class="cx"> {
</span><ins>+ // The following types are not supposed to create multicol context.
+ if (isFieldset() || isFileUploadControl() || isTextControl() || isListBox())
+ return false;
+
</ins><span class="cx"> if (!firstChild())
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ // If overflow-y is set to paged-x or paged-y on the body or html element, we'll handle the paginating in the RenderView instead.
+ if ((style().overflowY() == OPAGEDX || style().overflowY() == OPAGEDY) && !(isDocumentElementRenderer() || isBody()))
+ return true;
+
</ins><span class="cx"> if (!style().specifiesColumns())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // column-axis initiates MultiColumnFlowThread.
</del><ins>+ // column-axis with opposite writing direction initiates MultiColumnFlowThread.
</ins><span class="cx"> if (!style().hasInlineColumnAxis())
</span><span class="cx"> return true;
</span><span class="cx">
</span><span class="lines">@@ -444,6 +452,9 @@
</span><span class="cx"> if (!style().hasAutoColumnWidth())
</span><span class="cx"> return true;
</span><span class="cx">
</span><ins>+ if (desiredColumnCount)
+ return desiredColumnCount.value() > 1;
+
</ins><span class="cx"> // column-count > 1 always initiates MultiColumnFlowThread.
</span><span class="cx"> if (!style().hasAutoColumnCount())
</span><span class="cx"> return style().columnCount() > 1;
</span><span class="lines">@@ -3946,12 +3957,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderBlockFlow::requiresColumns(int desiredColumnCount) const
</span><del>-{
- // If overflow-y is set to paged-x or paged-y on the body or html element, we'll handle the paginating
- // in the RenderView instead.
- bool isPaginated = (style().overflowY() == OPAGEDX || style().overflowY() == OPAGEDY) && !(isDocumentElementRenderer() || isBody());
-
- return firstChild() && (desiredColumnCount != 1 || !style().hasAutoColumnWidth() || !style().hasInlineColumnAxis() || isPaginated);
</del><ins>+{
+ return willCreateColumns(desiredColumnCount);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderBlockFlow::setComputedColumnCountAndWidth(int count, LayoutUnit width)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.h (209545 => 209546)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-12-08 18:19:14 UTC (rev 209545)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.h 2016-12-08 18:20:01 UTC (rev 209546)
</span><span class="lines">@@ -282,7 +282,7 @@
</span><span class="cx">
</span><span class="cx"> RenderMultiColumnFlowThread* multiColumnFlowThread() const { return hasRareBlockFlowData() ? rareBlockFlowData()->m_multiColumnFlowThread : nullptr; }
</span><span class="cx"> void setMultiColumnFlowThread(RenderMultiColumnFlowThread*);
</span><del>- bool willCreateColumns();
</del><ins>+ bool willCreateColumns(std::optional<unsigned> desiredColumnCount = std::nullopt) const;
</ins><span class="cx">
</span><span class="cx"> bool containsFloats() const override { return m_floatingObjects && !m_floatingObjects->set().isEmpty(); }
</span><span class="cx"> bool containsFloat(RenderBox&) const;
</span></span></pre>
</div>
</div>
</body>
</html>