<!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>[214126] 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/214126">214126</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2017-03-17 14:59:33 -0700 (Fri, 17 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Disable per-region boxes for multicolumn
https://bugs.webkit.org/show_bug.cgi?id=169830
Reviewed by Zalan Bujtas.
Source/WebCore:
Test: fast/multicol/float-adjacent-to-overflow-block.html
* rendering/RenderBlockFlow.cpp:
(WebCore::RenderBlockFlow::determineLogicalLeftPositionForChild):
* rendering/RenderBox.cpp:
(WebCore::RenderBox::borderBoxRectInRegion):
(WebCore::RenderBox::renderBoxRegionInfo):
Limit all of the per-region box code to RenderNamedFlowThreads.
This code should never be used by multicolumn layout.
LayoutTests:
* fast/multicol/float-adjacent-to-overflow-block-expected.html: Added.
* fast/multicol/float-adjacent-to-overflow-block.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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmulticolfloatadjacenttooverflowblockexpectedhtml">trunk/LayoutTests/fast/multicol/float-adjacent-to-overflow-block-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastmulticolfloatadjacenttooverflowblockhtml">trunk/LayoutTests/fast/multicol/float-adjacent-to-overflow-block.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214125 => 214126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-17 21:51:03 UTC (rev 214125)
+++ trunk/LayoutTests/ChangeLog 2017-03-17 21:59:33 UTC (rev 214126)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-17 Dave Hyatt <hyatt@apple.com>
+
+ Disable per-region boxes for multicolumn
+ https://bugs.webkit.org/show_bug.cgi?id=169830
+
+ Reviewed by Zalan Bujtas.
+
+ * fast/multicol/float-adjacent-to-overflow-block-expected.html: Added.
+ * fast/multicol/float-adjacent-to-overflow-block.html: Added.
+
</ins><span class="cx"> 2017-03-17 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> [WebCrypto] Make sure all CryptoKey classes are structured clonable
</span></span></pre></div>
<a id="trunkLayoutTestsfastmulticolfloatadjacenttooverflowblockexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/float-adjacent-to-overflow-block-expected.html (0 => 214126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/float-adjacent-to-overflow-block-expected.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/float-adjacent-to-overflow-block-expected.html 2017-03-17 21:59:33 UTC (rev 214126)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <style>
+ html { width: 250px; height:500px; }
+ body { margin: 0 }
+ .float {
+ width:80px;
+ height:80px;
+ border:5px solid maroon;
+ margin:0;
+ }
+ .left {float:left;}
+ .heading {
+ overflow:hidden;
+ border:5px solid blue;
+ }
+ </style>
+ </head>
+ <html>
+ <body>
+ <div class="float left"></div>
+ <h1 class="heading">Text that should not be clipped out.</h1>
+
+ </body>
+ </html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmulticolfloatadjacenttooverflowblockhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/multicol/float-adjacent-to-overflow-block.html (0 => 214126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/multicol/float-adjacent-to-overflow-block.html (rev 0)
+++ trunk/LayoutTests/fast/multicol/float-adjacent-to-overflow-block.html 2017-03-17 21:59:33 UTC (rev 214126)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html><html xmlns="http://www.w3.org/1999/xhtml">
+ <head>
+ <style>
+ html { column-width:250px; column-gap:0; height:500px; width:500px; column-fill:auto }
+ body { margin: 0 }
+ .float {
+ width:80px;
+ height:80px;
+ border:5px solid maroon;
+ margin:0;
+ }
+ .left {float:left;}
+ .heading {
+ overflow:hidden;
+ border:5px solid blue;
+ }
+ </style>
+ </head>
+ <html>
+ <body>
+ <div class="float left"></div>
+ <h1 class="heading">Text that should not be clipped out.</h1>
+
+ </body>
+ </html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214125 => 214126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-17 21:51:03 UTC (rev 214125)
+++ trunk/Source/WebCore/ChangeLog 2017-03-17 21:59:33 UTC (rev 214126)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-17 Dave Hyatt <hyatt@apple.com>
+
+ Disable per-region boxes for multicolumn
+ https://bugs.webkit.org/show_bug.cgi?id=169830
+
+ Reviewed by Zalan Bujtas.
+
+ Test: fast/multicol/float-adjacent-to-overflow-block.html
+
+ * rendering/RenderBlockFlow.cpp:
+ (WebCore::RenderBlockFlow::determineLogicalLeftPositionForChild):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::borderBoxRectInRegion):
+ (WebCore::RenderBox::renderBoxRegionInfo):
+ Limit all of the per-region box code to RenderNamedFlowThreads.
+ This code should never be used by multicolumn layout.
+
</ins><span class="cx"> 2017-03-17 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Time channel attack on SVG Filters
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBlockFlowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlockFlow.cpp (214125 => 214126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-03-17 21:51:03 UTC (rev 214125)
+++ trunk/Source/WebCore/rendering/RenderBlockFlow.cpp 2017-03-17 21:59:33 UTC (rev 214126)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> #include "LayoutRepainter.h"
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "RenderCombineText.h"
</span><del>-#include "RenderFlowThread.h"
</del><span class="cx"> #include "RenderInline.h"
</span><span class="cx"> #include "RenderIterator.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><span class="lines">@@ -46,6 +45,7 @@
</span><span class="cx"> #include "RenderMultiColumnFlowThread.h"
</span><span class="cx"> #include "RenderMultiColumnSet.h"
</span><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><ins>+#include "RenderNamedFlowThread.h"
</ins><span class="cx"> #include "RenderTableCell.h"
</span><span class="cx"> #include "RenderText.h"
</span><span class="cx"> #include "RenderView.h"
</span><span class="lines">@@ -876,7 +876,7 @@
</span><span class="cx">
</span><span class="cx"> // Some objects (e.g., tables, horizontal rules, overflow:auto blocks) avoid floats. They need
</span><span class="cx"> // to shift over as necessary to dodge any floats that might get in the way.
</span><del>- if (child.avoidsFloats() && containsFloats() && !flowThreadContainingBlock())
</del><ins>+ if (child.avoidsFloats() && containsFloats() && !is<RenderNamedFlowThread>(flowThreadContainingBlock()))
</ins><span class="cx"> newPosition += computeStartPositionDeltaForChildAvoidingFloats(child, marginStartForChild(child));
</span><span class="cx">
</span><span class="cx"> setLogicalLeftForChild(child, style().isLeftToRightDirection() ? newPosition : totalAvailableLogicalWidth - newPosition - logicalWidthForChild(child), applyDelta);
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (214125 => 214126)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2017-03-17 21:51:03 UTC (rev 214125)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2017-03-17 21:59:33 UTC (rev 214126)
</span><span class="lines">@@ -211,8 +211,8 @@
</span><span class="cx"> if (!region)
</span><span class="cx"> return borderBoxRect();
</span><span class="cx">
</span><del>- RenderFlowThread* flowThread = flowThreadContainingBlock();
- if (!flowThread)
</del><ins>+ auto* flowThread = flowThreadContainingBlock();
+ if (!is<RenderNamedFlowThread>(flowThread))
</ins><span class="cx"> return borderBoxRect();
</span><span class="cx">
</span><span class="cx"> RenderRegion* startRegion = nullptr;
</span><span class="lines">@@ -2729,7 +2729,7 @@
</span><span class="cx"> // FIXME: For now we limit this computation to normal RenderBlocks. Future patches will expand
</span><span class="cx"> // support to cover all boxes.
</span><span class="cx"> RenderFlowThread* flowThread = flowThreadContainingBlock();
</span><del>- if (isRenderFlowThread() || !flowThread || !canHaveBoxInfoInRegion() || flowThread->style().writingMode() != style().writingMode())
</del><ins>+ if (isRenderFlowThread() || !is<RenderNamedFlowThread>(flowThread) || !canHaveBoxInfoInRegion() || flowThread->style().writingMode() != style().writingMode())
</ins><span class="cx"> return nullptr;
</span><span class="cx">
</span><span class="cx"> LogicalExtentComputedValues computedValues;
</span></span></pre>
</div>
</div>
</body>
</html>