<!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>[190592] 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/190592">190592</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-10-05 16:43:13 -0700 (Mon, 05 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Reference cycles during SVG dependency invalidation
https://bugs.webkit.org/show_bug.cgi?id=149824
<rdar://problem/22771412>
Reviewed by Tim Horton.
Source/WebCore:
Detect any reference cycles as we are invalidating.
This is mostly a merge of the following Blink commit:
https://chromium.googlesource.com/chromium/blink/+/a4bc83453bda89823b672877dc02247652a02d51
Test: svg/custom/reference-cycle.svg
* rendering/svg/RenderSVGResource.cpp:
(WebCore::removeFromCacheAndInvalidateDependencies): Keep around a hash
table of dependencies, so that we can detect if an element is already
present before marking it.
LayoutTests:
Adding a test that has a cycle between feImage resources.
Merge Blink commit:
https://chromium.googlesource.com/chromium/blink/+/a4bc83453bda89823b672877dc02247652a02d51
* svg/custom/reference-cycle-expected.txt: Added.
* svg/custom/reference-cycle.svg: 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="#trunkSourceWebCorerenderingsvgRenderSVGResourcecpp">trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgcustomreferencecycleexpectedtxt">trunk/LayoutTests/svg/custom/reference-cycle-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgcustomreferencecyclesvg">trunk/LayoutTests/svg/custom/reference-cycle.svg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (190591 => 190592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-05 23:36:56 UTC (rev 190591)
+++ trunk/LayoutTests/ChangeLog 2015-10-05 23:43:13 UTC (rev 190592)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-10-05 Dean Jackson <dino@apple.com>
+
+ Reference cycles during SVG dependency invalidation
+ https://bugs.webkit.org/show_bug.cgi?id=149824
+ <rdar://problem/22771412>
+
+ Reviewed by Tim Horton.
+
+ Adding a test that has a cycle between feImage resources.
+
+ Merge Blink commit:
+ https://chromium.googlesource.com/chromium/blink/+/a4bc83453bda89823b672877dc02247652a02d51
+
+ * svg/custom/reference-cycle-expected.txt: Added.
+ * svg/custom/reference-cycle.svg: Added.
+
</ins><span class="cx"> 2015-10-05 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking compositing/video/video-poster.html as flaky for El Capitan.
</span></span></pre></div>
<a id="trunkLayoutTestssvgcustomreferencecycleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/reference-cycle-expected.txt (0 => 190592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/reference-cycle-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/custom/reference-cycle-expected.txt 2015-10-05 23:43:13 UTC (rev 190592)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS: did not crash.
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/custom/reference-cycle-expected.txt
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</h4></div>
<a id="svneolstyle"></a>
<div class="addfile"><h4>Added: svn:eol-style</h4></div>
<a id="trunkLayoutTestssvgcustomreferencecyclesvg"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/custom/reference-cycle.svg (0 => 190592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/custom/reference-cycle.svg (rev 0)
+++ trunk/LayoutTests/svg/custom/reference-cycle.svg 2015-10-05 23:43:13 UTC (rev 190592)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ <defs>
+ <filter>
+ <feImage id="self" xlink:href="#self"/>
+ </filter>
+
+ <filter>
+ <feImage id="indirect_1" xlink:href="#indirect_2"/>
+ <feImage id="indirect_2" xlink:href="#indirect_1"/>
+ </filter>
+ </defs>
+
+ <text y="100">PASS: did not crash.</text>
+
+ <script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ </script>
+</svg>
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/custom/reference-cycle.svg
</span><span class="cx">___________________________________________________________________
</span></span></pre></div>
<a id="svnmimetype"></a>
<div class="addfile"><h4>Added: svn:mime-type</h4></div>
<a id="svnkeywords"></a>
<div class="addfile"><h4>Added: svn:keywords</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 (190591 => 190592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-05 23:36:56 UTC (rev 190591)
+++ trunk/Source/WebCore/ChangeLog 2015-10-05 23:43:13 UTC (rev 190592)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-10-05 Dean Jackson <dino@apple.com>
+
+ Reference cycles during SVG dependency invalidation
+ https://bugs.webkit.org/show_bug.cgi?id=149824
+ <rdar://problem/22771412>
+
+ Reviewed by Tim Horton.
+
+ Detect any reference cycles as we are invalidating.
+
+ This is mostly a merge of the following Blink commit:
+ https://chromium.googlesource.com/chromium/blink/+/a4bc83453bda89823b672877dc02247652a02d51
+
+ Test: svg/custom/reference-cycle.svg
+
+ * rendering/svg/RenderSVGResource.cpp:
+ (WebCore::removeFromCacheAndInvalidateDependencies): Keep around a hash
+ table of dependencies, so that we can detect if an element is already
+ present before marking it.
+
</ins><span class="cx"> 2015-10-05 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix null pointer dereference in WebSocket::connect()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp (190591 => 190592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2015-10-05 23:36:56 UTC (rev 190591)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResource.cpp 2015-10-05 23:43:13 UTC (rev 190592)
</span><span class="lines">@@ -172,9 +172,20 @@
</span><span class="cx"> HashSet<SVGElement*>* dependencies = renderer.document().accessSVGExtensions().setOfElementsReferencingTarget(downcast<SVGElement>(renderer.element()));
</span><span class="cx"> if (!dependencies)
</span><span class="cx"> return;
</span><ins>+
+ // We allow cycles in SVGDocumentExtensions reference sets in order to avoid expensive
+ // reference graph adjustments on changes, so we need to break possible cycles here.
+ static NeverDestroyed<HashSet<SVGElement*>> invalidatingDependencies;
+
</ins><span class="cx"> for (auto* element : *dependencies) {
</span><del>- if (auto* renderer = element->renderer())
</del><ins>+ if (auto* renderer = element->renderer()) {
+ if (UNLIKELY(!invalidatingDependencies.get().add(element).isNewEntry)) {
+ // Reference cycle: we are in process of invalidating this dependant.
+ continue;
+ }
</ins><span class="cx"> RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer, needsLayout);
</span><ins>+ invalidatingDependencies.get().remove(element);
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>