<!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>[167439] 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/167439">167439</a></dd>
<dt>Author</dt> <dd>hyatt@apple.com</dd>
<dt>Date</dt> <dd>2014-04-17 10:53:40 -0700 (Thu, 17 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[New Multicolumn] Column sets below spanners don't repaint properly.
https://bugs.webkit.org/show_bug.cgi?id=131778
Reviewed by Beth Dakin.
Source/WebCore:
Added fast/repaint/spanner-with-margins.html.
* rendering/RenderBox.cpp:
(WebCore::RenderBox::computeRectForRepaint):
Turn off some code that was running for in-flow RenderFlowThreads that made no sense.
I'm not convinced the code is right for other types of RenderFlowThreads either,
but will leave that to the named flow thread experts. :)
LayoutTests:
* fast/repaint/spanner-with-margin-expected.txt: Added.
* fast/repaint/spanner-with-margin.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="#trunkSourceWebCorerenderingRenderBoxcpp">trunk/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastrepaintspannerwithmarginexpectedtxt">trunk/LayoutTests/fast/repaint/spanner-with-margin-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastrepaintspannerwithmarginhtml">trunk/LayoutTests/fast/repaint/spanner-with-margin.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167438 => 167439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-17 17:52:23 UTC (rev 167438)
+++ trunk/LayoutTests/ChangeLog 2014-04-17 17:53:40 UTC (rev 167439)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-17 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] Column sets below spanners don't repaint properly.
+ https://bugs.webkit.org/show_bug.cgi?id=131778
+
+ Reviewed by Beth Dakin.
+
+ * fast/repaint/spanner-with-margin-expected.txt: Added.
+ * fast/repaint/spanner-with-margin.html: Added.
+
</ins><span class="cx"> 2014-04-17 Eduardo Lima Mitev <elima@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [Gardening] Updates GTK test expectations
</span></span></pre></div>
<a id="trunkLayoutTestsfastrepaintspannerwithmarginexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/spanner-with-margin-expected.txt (0 => 167439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/spanner-with-margin-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/repaint/spanner-with-margin-expected.txt 2014-04-17 17:53:40 UTC (rev 167439)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+You should see the word 'PASS' five times below (letter spacing will differ), and no red:
+
+P
+P
+A
+A
+S
+S
+S
+S
+PASS
+
+P
+P
+A
+A
+S
+S
+S
+S
+(repaint rects
+ (rect 104 334 18 37)
+ (rect 104 334 18 37)
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastrepaintspannerwithmarginhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/repaint/spanner-with-margin.html (0 => 167439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/repaint/spanner-with-margin.html (rev 0)
+++ trunk/LayoutTests/fast/repaint/spanner-with-margin.html 2014-04-17 17:53:40 UTC (rev 167439)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <title>Spanner with margins</title>
+<script>
+if (window.internals)
+ internals.settings.setRegionBasedColumnsEnabled(true);
+</script>
+
+ </head>
+ <body>
+ <p>You should see the word 'PASS' five times below (letter spacing will differ), and no red:</p>
+ <div style="zoom:2; -webkit-columns:4; columns:4; -webkit-column-gap:0; column-gap:0; width:4em;">
+ P<br>P<br>A<br>A<br>S<br>S<br>S<br>S
+ <div style="background:red;">
+ <div id="grrr" style="width:200px; border:2px solid blue; -webkit-column-span:all; column-span:all; margin:2em;">PASS<br>&nbsp;</div>
+ </div>
+ P<br>P<br>A<br>A<br>S<br>S<br><a id="foo" style="color:red" href="#">S</a><br>S
+ </div>
+
+<script src="resources/text-based-repaint.js" type="text/javascript"></script>
+ <script>
+ repaintTest = function() {
+ document.getElementById('foo').style.color = 'green'
+ };
+ runRepaintTest();
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167438 => 167439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-17 17:52:23 UTC (rev 167438)
+++ trunk/Source/WebCore/ChangeLog 2014-04-17 17:53:40 UTC (rev 167439)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-04-17 David Hyatt <hyatt@apple.com>
+
+ [New Multicolumn] Column sets below spanners don't repaint properly.
+ https://bugs.webkit.org/show_bug.cgi?id=131778
+
+ Reviewed by Beth Dakin.
+
+ Added fast/repaint/spanner-with-margins.html.
+
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::computeRectForRepaint):
+ Turn off some code that was running for in-flow RenderFlowThreads that made no sense.
+ I'm not convinced the code is right for other types of RenderFlowThreads either,
+ but will leave that to the named flow thread experts. :)
+
</ins><span class="cx"> 2014-04-17 Koji Ishii <kojishi@gmail.com>
</span><span class="cx">
</span><span class="cx"> Catch up ruby and its tag omission rule changes in HTML5 CR Feb 2014
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (167438 => 167439)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-17 17:52:23 UTC (rev 167438)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2014-04-17 17:53:40 UTC (rev 167439)
</span><span class="lines">@@ -2107,8 +2107,9 @@
</span><span class="cx"> auto o = container(repaintContainer, &containerSkipped);
</span><span class="cx"> if (!o)
</span><span class="cx"> return;
</span><del>-
- if (o->isRenderFlowThread()) {
</del><ins>+
+ // This code isn't necessary for in-flow RenderFlowThreads.
+ if (o->isOutOfFlowRenderFlowThread()) {
</ins><span class="cx"> RenderRegion* firstRegion = nullptr;
</span><span class="cx"> RenderRegion* lastRegion = nullptr;
</span><span class="cx"> if (toRenderFlowThread(o)->getRegionRangeForBox(this, firstRegion, lastRegion))
</span></span></pre>
</div>
</div>
</body>
</html>