<!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>[194426] 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/194426">194426</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2015-12-27 14:56:57 -0800 (Sun, 27 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Should never be reached failure in WebCore::RenderElement::clearLayoutRootIfNeeded
https://bugs.webkit.org/show_bug.cgi?id=151590
Reviewed by Simon Fraser.
We should always set the layoutroot when a new subtree layout is requested (and convert it
to a full layout when needed). It ensures that renderers are detached cleanly even when
they are set as layoutroot.
Source/WebCore:
Test: fast/block/assert-when-layout-root-is-not-cleared.html
* page/FrameView.cpp:
(WebCore::FrameView::scheduleRelayoutOfSubtree):
LayoutTests:
* fast/block/assert-when-layout-root-is-not-cleared-expected.txt: Added.
* fast/block/assert-when-layout-root-is-not-cleared.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="#trunkSourceWebCorepageFrameViewcpp">trunk/Source/WebCore/page/FrameView.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastblockassertwhenlayoutrootisnotclearedexpectedtxt">trunk/LayoutTests/fast/block/assert-when-layout-root-is-not-cleared-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastblockassertwhenlayoutrootisnotclearedhtml">trunk/LayoutTests/fast/block/assert-when-layout-root-is-not-cleared.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194425 => 194426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-12-27 07:21:12 UTC (rev 194425)
+++ trunk/LayoutTests/ChangeLog 2015-12-27 22:56:57 UTC (rev 194426)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-12-27 Zalan Bujtas <zalan@apple.com>
+
+ Should never be reached failure in WebCore::RenderElement::clearLayoutRootIfNeeded
+ https://bugs.webkit.org/show_bug.cgi?id=151590
+
+ Reviewed by Simon Fraser.
+
+ We should always set the layoutroot when a new subtree layout is requested (and convert it
+ to a full layout when needed). It ensures that renderers are detached cleanly even when
+ they are set as layoutroot.
+
+ * fast/block/assert-when-layout-root-is-not-cleared-expected.txt: Added.
+ * fast/block/assert-when-layout-root-is-not-cleared.html: Added.
+
</ins><span class="cx"> 2015-12-25 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Subpixel rendering: Add subpixel support for outline.
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockassertwhenlayoutrootisnotclearedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/assert-when-layout-root-is-not-cleared-expected.txt (0 => 194426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/assert-when-layout-root-is-not-cleared-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/block/assert-when-layout-root-is-not-cleared-expected.txt 2015-12-27 22:56:57 UTC (rev 194426)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Pass if no assert in debug.
+foo
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockassertwhenlayoutrootisnotclearedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/assert-when-layout-root-is-not-cleared.html (0 => 194426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/assert-when-layout-root-is-not-cleared.html (rev 0)
+++ trunk/LayoutTests/fast/block/assert-when-layout-root-is-not-cleared.html 2015-12-27 22:56:57 UTC (rev 194426)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<html>
+<head>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+window.onload = function() {
+ document.designMode = 'on';
+ document.execCommand('selectAll');
+ document.execCommand('indent');
+}
+</script>
+<style>
+* {
+ -webkit-appearance: checkbox;
+}
+</style>
+</head>
+<body>Pass if no assert in debug.<div>foo</div></body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194425 => 194426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-12-27 07:21:12 UTC (rev 194425)
+++ trunk/Source/WebCore/ChangeLog 2015-12-27 22:56:57 UTC (rev 194426)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-12-27 Zalan Bujtas <zalan@apple.com>
+
+ Should never be reached failure in WebCore::RenderElement::clearLayoutRootIfNeeded
+ https://bugs.webkit.org/show_bug.cgi?id=151590
+
+ Reviewed by Simon Fraser.
+
+ We should always set the layoutroot when a new subtree layout is requested (and convert it
+ to a full layout when needed). It ensures that renderers are detached cleanly even when
+ they are set as layoutroot.
+
+ Test: fast/block/assert-when-layout-root-is-not-cleared.html
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::scheduleRelayoutOfSubtree):
+
</ins><span class="cx"> 2015-12-26 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CMake] Rearrange new gamepad files with deprecated files
</span></span></pre></div>
<a id="trunkSourceWebCorepageFrameViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/FrameView.cpp (194425 => 194426)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/FrameView.cpp 2015-12-27 07:21:12 UTC (rev 194425)
+++ trunk/Source/WebCore/page/FrameView.cpp 2015-12-27 22:56:57 UTC (rev 194426)
</span><span class="lines">@@ -2654,7 +2654,8 @@
</span><span class="cx"> ASSERT(frame().view() == this);
</span><span class="cx">
</span><span class="cx"> if (renderView.needsLayout()) {
</span><del>- newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No);
</del><ins>+ m_layoutRoot = &newRelayoutRoot;
+ convertSubtreeLayoutToFullLayout();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2695,8 +2696,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Just do a full relayout.
</span><ins>+ m_layoutRoot = &newRelayoutRoot;
</ins><span class="cx"> convertSubtreeLayoutToFullLayout();
</span><del>- newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No);
</del><span class="cx"> InspectorInstrumentation::didInvalidateLayout(frame());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>