<!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>[167541] 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/167541">167541</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-19 11:57:46 -0700 (Sat, 19 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CSS Regions] Harden the layout in case there are no regions
https://bugs.webkit.org/show_bug.cgi?id=131517
Patch by Andrei Bucur <abucur@adobe.com> on 2014-04-19
Reviewed by Mihnea Ovidenie.
Source/WebCore:
The patch fixes the cases when the content of a flow thread is not
properly invalidated when all the regions of its chain are removed.
Test: fast/regions/simplified-layout-no-regions.html
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::logicalWidthChangedInRegionsForBlock):
* rendering/RenderRegion.cpp:
(WebCore::RenderRegion::ensureOverflowForBox):
LayoutTests:
Add a test that verifies the content of a flow thread is updated when all
the regions are removed.
* fast/regions/simplified-layout-no-regions-expected.txt: Added.
* fast/regions/simplified-layout-no-regions.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="#trunkSourceWebCorerenderingRenderRegioncpp">trunk/Source/WebCore/rendering/RenderRegion.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionssimplifiedlayoutnoregionsexpectedtxt">trunk/LayoutTests/fast/regions/simplified-layout-no-regions-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastregionssimplifiedlayoutnoregionshtml">trunk/LayoutTests/fast/regions/simplified-layout-no-regions.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (167540 => 167541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-19 18:36:56 UTC (rev 167540)
+++ trunk/LayoutTests/ChangeLog 2014-04-19 18:57:46 UTC (rev 167541)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-19 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] Harden the layout in case there are no regions
+ https://bugs.webkit.org/show_bug.cgi?id=131517
+
+ Reviewed by Mihnea Ovidenie.
+
+ Add a test that verifies the content of a flow thread is updated when all
+ the regions are removed.
+
+ * fast/regions/simplified-layout-no-regions-expected.txt: Added.
+ * fast/regions/simplified-layout-no-regions.html: Added.
+
</ins><span class="cx"> 2014-04-19 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleared executable bits on many .html and .txt files.
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionssimplifiedlayoutnoregionsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/simplified-layout-no-regions-expected.txt (0 => 167541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/simplified-layout-no-regions-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/regions/simplified-layout-no-regions-expected.txt 2014-04-19 18:57:46 UTC (rev 167541)
</span><span class="lines">@@ -0,0 +1,5 @@
</span><ins>+The test passes if there is no crash or assert.
+
+PASS
+
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/regions/simplified-layout-no-regions-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestsfastregionssimplifiedlayoutnoregionshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/simplified-layout-no-regions.html (0 => 167541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/simplified-layout-no-regions.html (rev 0)
+++ trunk/LayoutTests/fast/regions/simplified-layout-no-regions.html 2014-04-19 18:57:46 UTC (rev 167541)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+<html>
+ <head>
+ <style>
+ body.hidden ol { visibility: hidden; }
+ ol > li { position: relative; }
+ li::after { position: absolute; }
+ ol.chapter > li { counter-increment: chapter; }
+ ol.section > li::after { content: counter(chapter); }
+
+ .extract { -webkit-flow-into: f1; }
+ #region { -webkit-flow-from: f1; }
+ </style>
+ </head>
+ <body>
+ <p>The test passes if there is no crash or assert.</p>
+ <p>PASS</p>
+ <ol id="start" class="chapter">
+ <li>
+ <ol class="section extract">
+ <li>I</li>
+ </ol>
+ </li>
+ </ol>
+ <ol class="section">
+ <li id="second">II</li>
+ <li id="third">III</li>
+ </ol>
+ <div id="region"></div>
+ <div id="end"></div>
+ <script>
+ if (window.testRunner)
+ window.testRunner.dumpAsText();
+
+ document.body.offsetParent;
+ var range = document.createRange();
+ range.setStart(document.getElementById("start"));
+ range.setEnd(document.getElementById("start"));
+ range.surroundContents(document.getElementById("third"));
+ range.setStart(document.getElementById("second"), 1);
+ range.setEnd(document.getElementById("end"));
+ range.deleteContents();
+ document.body.offsetParent;
+
+ if (window.testRunner)
+ document.body.className = "hidden";
+ </script>
+ </body>
+</html>
+
</ins><span class="cx">Property changes on: trunk/LayoutTests/fast/regions/simplified-layout-no-regions.html
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167540 => 167541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-19 18:36:56 UTC (rev 167540)
+++ trunk/Source/WebCore/ChangeLog 2014-04-19 18:57:46 UTC (rev 167541)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-19 Andrei Bucur <abucur@adobe.com>
+
+ [CSS Regions] Harden the layout in case there are no regions
+ https://bugs.webkit.org/show_bug.cgi?id=131517
+
+ Reviewed by Mihnea Ovidenie.
+
+ The patch fixes the cases when the content of a flow thread is not
+ properly invalidated when all the regions of its chain are removed.
+
+ Test: fast/regions/simplified-layout-no-regions.html
+
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::logicalWidthChangedInRegionsForBlock):
+ * rendering/RenderRegion.cpp:
+ (WebCore::RenderRegion::ensureOverflowForBox):
+
</ins><span class="cx"> 2014-04-19 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=131594
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (167540 => 167541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-19 18:36:56 UTC (rev 167540)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-04-19 18:57:46 UTC (rev 167541)
</span><span class="lines">@@ -590,8 +590,13 @@
</span><span class="cx">
</span><span class="cx"> void RenderFlowThread::logicalWidthChangedInRegionsForBlock(const RenderBlock* block, bool& relayoutChildren)
</span><span class="cx"> {
</span><del>- if (!hasValidRegionInfo())
</del><ins>+ if (!hasValidRegionInfo()) {
+ // FIXME: Remove once we stop laying out flow threads without regions.
+ // If we had regions but don't any more, relayout the children because the code below
+ // can't properly detect this scenario.
+ relayoutChildren |= previousRegionCountChanged();
</ins><span class="cx"> return;
</span><ins>+ }
</ins><span class="cx">
</span><span class="cx"> auto it = m_regionRangeMap.find(block);
</span><span class="cx"> if (it == m_regionRangeMap.end())
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderRegioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderRegion.cpp (167540 => 167541)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-04-19 18:36:56 UTC (rev 167540)
+++ trunk/Source/WebCore/rendering/RenderRegion.cpp 2014-04-19 18:57:46 UTC (rev 167541)
</span><span class="lines">@@ -430,6 +430,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderRegion::ensureOverflowForBox(const RenderBox* box, RefPtr<RenderOverflow>& overflow, bool forceCreation)
</span><span class="cx"> {
</span><ins>+ ASSERT(m_flowThread->renderRegionList().contains(this));
</ins><span class="cx"> ASSERT(isValid());
</span><span class="cx">
</span><span class="cx"> RenderBoxRegionInfo* boxInfo = renderBoxRegionInfo(box);
</span></span></pre>
</div>
</div>
</body>
</html>