<!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>[200848] releases/WebKitGTK/webkit-2.12</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/200848">200848</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-13 05:33:19 -0700 (Fri, 13 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200301">r200301</a> - Some content causes deep recursion.
https://bugs.webkit.org/show_bug.cgi?id=157230
<rdar://problem/7694756>
Reviewed by Antti Koivisto.
This patch sets a limit(512) on content nesting for the render tree. Elements injected over the limit
are still accessible through DOM APIs but
1. we stop generating renderers for them -they behave like display: none.
2. their layout related computed style values are set to default (e.g. window.computedStyle(document.elementById("over512").width -> auto)
Source/WebCore:
Test: fast/block/nested-renderers.html
* page/Settings.h:
* style/StyleTreeResolver.cpp: Skip renderer constructing and continue with the sibling node.
(WebCore::Style::TreeResolver::resolveComposedTree):
LayoutTests:
* fast/block/nested-renderers-expected.html: Added.
* fast/block/nested-renderers.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorepageSettingsh">releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorestyleStyleTreeResolvercpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/style/StyleTreeResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastblocknestedrenderersexpectedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/nested-renderers-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastblocknestedrenderershtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/nested-renderers.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (200847 => 200848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-13 12:26:17 UTC (rev 200847)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-13 12:33:19 UTC (rev 200848)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-04-30 Zalan Bujtas <zalan@apple.com>
+
+ Some content causes deep recursion.
+ https://bugs.webkit.org/show_bug.cgi?id=157230
+ <rdar://problem/7694756>
+
+ Reviewed by Antti Koivisto.
+
+ This patch sets a limit(512) on content nesting for the render tree. Elements injected over the limit
+ are still accessible through DOM APIs but
+ 1. we stop generating renderers for them -they behave like display: none.
+ 2. their layout related computed style values are set to default (e.g. window.computedStyle(document.elementById("over512").width -> auto)
+
+ * fast/block/nested-renderers-expected.html: Added.
+ * fast/block/nested-renderers.html: Added.
+
</ins><span class="cx"> 2016-04-29 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(194502): overflow: scroll; direction: rtl; divs jump horizontally when scrolled vertically
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastblocknestedrenderersexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/nested-renderers-expected.html (0 => 200848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/nested-renderers-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/nested-renderers-expected.html 2016-05-13 12:33:19 UTC (rev 200848)
</span><span class="lines">@@ -0,0 +1,16 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we stop generating renderers at certain nesting depth.</title>
+<style>
+div {
+ width: 102px;
+ height: 102px;
+ background-color: green;
+}
+</style>
+</head>
+<body>
+ <div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastblocknestedrenderershtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/nested-renderers.html (0 => 200848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/nested-renderers.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/nested-renderers.html 2016-05-13 12:33:19 UTC (rev 200848)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we stop generating renderers at certain nesting depth.</title>
+<style>
+td {
+ border: 1px solid green;
+}
+</style>
+</head>
+<body></body>
+<script>
+var container = document.body;
+for (var i = 0; i < 3000; ++i) {
+ var element;
+ if (!(i % 10)) {
+ var table = document.createElement("table");
+ var tr = document.createElement("tr");
+ var td = document.createElement("td");
+ tr.appendChild(td);
+ table.appendChild(tr);
+ element = td;
+ } else
+ element = document.createElement("div");
+ container.appendChild(element);
+ container = element;
+}
+</script>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (200847 => 200848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 12:26:17 UTC (rev 200847)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-13 12:33:19 UTC (rev 200848)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-04-30 Zalan Bujtas <zalan@apple.com>
+
+ Some content causes deep recursion.
+ https://bugs.webkit.org/show_bug.cgi?id=157230
+ <rdar://problem/7694756>
+
+ Reviewed by Antti Koivisto.
+
+ This patch sets a limit(512) on content nesting for the render tree. Elements injected over the limit
+ are still accessible through DOM APIs but
+ 1. we stop generating renderers for them -they behave like display: none.
+ 2. their layout related computed style values are set to default (e.g. window.computedStyle(document.elementById("over512").width -> auto)
+
+ Test: fast/block/nested-renderers.html
+
+ * page/Settings.h:
+ * style/StyleTreeResolver.cpp: Skip renderer constructing and continue with the sibling node.
+ (WebCore::Style::TreeResolver::resolveComposedTree):
+
</ins><span class="cx"> 2016-04-29 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(194502): overflow: scroll; direction: rtl; divs jump horizontally when scrolled vertically
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h (200847 => 200848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h 2016-05-13 12:26:17 UTC (rev 200847)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/page/Settings.h 2016-05-13 12:33:19 UTC (rev 200848)
</span><span class="lines">@@ -206,6 +206,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> static const unsigned defaultMaximumHTMLParserDOMTreeDepth = 512;
</span><ins>+ static const unsigned defaultMaximumRenderTreeDepth = 512;
</ins><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT static void setMockScrollbarsEnabled(bool flag);
</span><span class="cx"> WEBCORE_EXPORT static bool mockScrollbarsEnabled();
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorestyleStyleTreeResolvercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/style/StyleTreeResolver.cpp (200847 => 200848)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/style/StyleTreeResolver.cpp 2016-05-13 12:26:17 UTC (rev 200847)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/style/StyleTreeResolver.cpp 2016-05-13 12:33:19 UTC (rev 200848)
</span><span class="lines">@@ -884,6 +884,13 @@
</span><span class="cx">
</span><span class="cx"> auto& element = downcast<Element>(node);
</span><span class="cx">
</span><ins>+ if (it.depth() > Settings::defaultMaximumRenderTreeDepth) {
+ resetStyleForNonRenderedDescendants(element);
+ element.clearChildNeedsStyleRecalc();
+ it.traverseNextSkippingChildren();
+ continue;
+ }
+
</ins><span class="cx"> // FIXME: We should deal with this during style invalidation.
</span><span class="cx"> bool affectedByPreviousSibling = element.styleIsAffectedByPreviousSibling() && parent.elementNeedingStyleRecalcAffectsNextSiblingElementStyle;
</span><span class="cx"> if (element.needsStyleRecalc() || parent.elementNeedingStyleRecalcAffectsNextSiblingElementStyle)
</span></span></pre>
</div>
</div>
</body>
</html>