<!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>[207947] releases/WebKitGTK/webkit-2.14</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/207947">207947</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-27 00:16:08 -0700 (Thu, 27 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/206916">r206916</a> - https://vuldb.com/?cvssv3.2012 takes long time to load.
https://bugs.webkit.org/show_bug.cgi?id=162994
<rdar://problem/28593746>
Reviewed by Darin Adler.
Source/WebCore:
Stop visiting cousins when we hit the style sharing search threshold.
In addition to mistakenly ignoring the threshold at SharingResolver::findSibling(), we
continued on searching for cousin elements.
Test: fast/selectors/slow-style-sharing-with-long-cousin-list.html
* style/StyleSharingResolver.cpp:
(WebCore::Style::SharingResolver::resolve):
(WebCore::Style::SharingResolver::findSibling):
(WebCore::Style::SharingResolver::locateCousinList):
LayoutTests:
It takes ~100 seconds to run this test case without the fix (300ms with the fix).
Surely it will timeout if it gets regressed.
* fast/selectors/slow-style-sharing-with-long-cousin-list-expected.txt: Added.
* fast/selectors/slow-style-sharing-with-long-cousin-list.html: Added.
* platform/mac/TestExpectations: Skip perf test in debug.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorestyleStyleSharingResolvercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/style/StyleSharingResolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastselectorsslowstylesharingwithlongcousinlistexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/selectors/slow-style-sharing-with-long-cousin-list-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsfastselectorsslowstylesharingwithlongcousinlisthtml">releases/WebKitGTK/webkit-2.14/LayoutTests/fast/selectors/slow-style-sharing-with-long-cousin-list.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (207946 => 207947)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-27 07:15:16 UTC (rev 207946)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-27 07:16:08 UTC (rev 207947)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-10-07 Zalan Bujtas <zalan@apple.com>
+
+ https://vuldb.com/?cvssv3.2012 takes long time to load.
+ https://bugs.webkit.org/show_bug.cgi?id=162994
+ <rdar://problem/28593746>
+
+ Reviewed by Darin Adler.
+
+ It takes ~100 seconds to run this test case without the fix (300ms with the fix).
+ Surely it will timeout if it gets regressed.
+
+ * fast/selectors/slow-style-sharing-with-long-cousin-list-expected.txt: Added.
+ * fast/selectors/slow-style-sharing-with-long-cousin-list.html: Added.
+ * platform/mac/TestExpectations: Skip perf test in debug.
+
</ins><span class="cx"> 2016-10-06 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] 304 revalidation on the network process does not update the validated response
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastselectorsslowstylesharingwithlongcousinlistexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/selectors/slow-style-sharing-with-long-cousin-list-expected.txt (0 => 207947)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/selectors/slow-style-sharing-with-long-cousin-list-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/selectors/slow-style-sharing-with-long-cousin-list-expected.txt 2016-10-27 07:16:08 UTC (rev 207947)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASSED.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestsfastselectorsslowstylesharingwithlongcousinlisthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/fast/selectors/slow-style-sharing-with-long-cousin-list.html (0 => 207947)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/fast/selectors/slow-style-sharing-with-long-cousin-list.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/fast/selectors/slow-style-sharing-with-long-cousin-list.html 2016-10-27 07:16:08 UTC (rev 207947)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test will timeout if we regress style sharing with long cousin list.</title>
+<style>
+td:nth-child(2) {
+ color: transparent;
+}
+</style>
+</head>
+<body>
+<div id=container></div>
+</body>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+var table = document.createElement("table");
+for (var i = 0; i < 30000; ++i) {
+ var row = document.createElement("tr");
+ row.appendChild(document.createElement("td"));
+ row.appendChild(document.createElement("td"));
+ table.appendChild(row);
+}
+document.body.appendChild(table);
+document.body.offsetHeight;
+document.body.innerText = "PASSED.";
+</script>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207946 => 207947)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 07:15:16 UTC (rev 207946)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-27 07:16:08 UTC (rev 207947)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-10-07 Zalan Bujtas <zalan@apple.com>
+
+ https://vuldb.com/?cvssv3.2012 takes long time to load.
+ https://bugs.webkit.org/show_bug.cgi?id=162994
+ <rdar://problem/28593746>
+
+ Reviewed by Darin Adler.
+
+ Stop visiting cousins when we hit the style sharing search threshold.
+
+ In addition to mistakenly ignoring the threshold at SharingResolver::findSibling(), we
+ continued on searching for cousin elements.
+
+ Test: fast/selectors/slow-style-sharing-with-long-cousin-list.html
+
+ * style/StyleSharingResolver.cpp:
+ (WebCore::Style::SharingResolver::resolve):
+ (WebCore::Style::SharingResolver::findSibling):
+ (WebCore::Style::SharingResolver::locateCousinList):
+
</ins><span class="cx"> 2016-10-07 Gwang Yoon Hwang <yoon@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Remove unneeded creation of TextureMapperPlatformLayerProxy
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorestyleStyleSharingResolvercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/style/StyleSharingResolver.cpp (207946 => 207947)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/style/StyleSharingResolver.cpp 2016-10-27 07:15:16 UTC (rev 207946)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/style/StyleSharingResolver.cpp 2016-10-27 07:16:08 UTC (rev 207947)
</span><span class="lines">@@ -115,6 +115,8 @@
</span><span class="cx"> shareElement = findSibling(context, cousinList, count);
</span><span class="cx"> if (shareElement)
</span><span class="cx"> break;
</span><ins>+ if (count >= cStyleSearchThreshold)
+ break;
</ins><span class="cx"> cousinList = locateCousinList(cousinList->parentElement());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -144,7 +146,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> if (canShareStyleWithElement(context, downcast<StyledElement>(*node)))
</span><span class="cx"> break;
</span><del>- if (count++ == cStyleSearchThreshold)
</del><ins>+ if (count++ >= cStyleSearchThreshold)
</ins><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx"> return downcast<StyledElement>(node);
</span><span class="lines">@@ -152,8 +154,7 @@
</span><span class="cx">
</span><span class="cx"> Node* SharingResolver::locateCousinList(const Element* parent) const
</span><span class="cx"> {
</span><del>- const unsigned maximumSearchCount = 10;
- for (unsigned count = 0; count < maximumSearchCount; ++count) {
</del><ins>+ for (unsigned count = 0; count < cStyleSearchThreshold; ++count) {
</ins><span class="cx"> auto* elementSharingParentStyle = m_elementsSharingStyle.get(parent);
</span><span class="cx"> if (!elementSharingParentStyle)
</span><span class="cx"> return nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>