<!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>[190049] releases/WebKitGTK/webkit-2.10</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/190049">190049</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-09-21 01:12:28 -0700 (Mon, 21 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cyclic resources were not detected if the reference had deep containers
https://bugs.webkit.org/show_bug.cgi?id=149182
Reviewed by John Honeycutt.
Source/WebCore:
During our examination of the SVG rendering tree looking for cycles,
if a resource pointed to something that had a nested structure, and
one of the parent nodes in that structure was a container object
without resources itself, we were not looking into the children.
Test: svg/custom/pattern-content-cycle-w-resourceless-container.html
* rendering/svg/SVGResourcesCycleSolver.cpp:
(WebCore::SVGResourcesCycleSolver::resourceContainsCycles): We should still
check all children resources, but not exit early if there are none. Instead
we should recurse into any children.
(WebCore::SVGResourcesCycleSolver::resolveCycles): Changes to some debug
code that no longer compiled (it's still off by default, but at least
it will work now).
LayoutTests:
This test was ported from Blink. I believe it originally
came from:
https://code.google.com/p/chromium/issues/detail?id=351713
* svg/custom/pattern-content-cycle-w-resourceless-container-expected.txt: Added.
* svg/custom/pattern-content-cycle-w-resourceless-container.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingsvgSVGResourcesCycleSolvercpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestssvgcustompatterncontentcyclewresourcelesscontainerexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/svg/custom/pattern-content-cycle-w-resourceless-container-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestssvgcustompatterncontentcyclewresourcelesscontainerhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/svg/custom/pattern-content-cycle-w-resourceless-container.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (190048 => 190049)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2015-09-21 08:10:21 UTC (rev 190048)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2015-09-21 08:12:28 UTC (rev 190049)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-09-17 Dean Jackson <dino@apple.com>
+
+ Cyclic resources were not detected if the reference had deep containers
+ https://bugs.webkit.org/show_bug.cgi?id=149182
+
+ Reviewed by John Honeycutt.
+
+ This test was ported from Blink. I believe it originally
+ came from:
+ https://code.google.com/p/chromium/issues/detail?id=351713
+
+ * svg/custom/pattern-content-cycle-w-resourceless-container-expected.txt: Added.
+ * svg/custom/pattern-content-cycle-w-resourceless-container.html: Added.
+
</ins><span class="cx"> 2015-09-13 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> document.lastModified should use the user's local time zone
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestssvgcustompatterncontentcyclewresourcelesscontainerexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/svg/custom/pattern-content-cycle-w-resourceless-container-expected.txt (0 => 190049)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/svg/custom/pattern-content-cycle-w-resourceless-container-expected.txt         (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/svg/custom/pattern-content-cycle-w-resourceless-container-expected.txt        2015-09-21 08:12:28 UTC (rev 190049)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+PASS if no crash (stack overflow).
+
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestssvgcustompatterncontentcyclewresourcelesscontainerhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/svg/custom/pattern-content-cycle-w-resourceless-container.html (0 => 190049)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/svg/custom/pattern-content-cycle-w-resourceless-container.html         (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/svg/custom/pattern-content-cycle-w-resourceless-container.html        2015-09-21 08:12:28 UTC (rev 190049)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+<!DOCTYPE html>
+<script>
+if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ window.onload = function() {
+ testRunner.notifyDone();
+ };
+}
+</script>
+<p>PASS if no crash (stack overflow).</p>
+<svg width="100" height="100">
+ <rect fill="url(#p1)" width="100" height="100"/>
+ <pattern id="p2" width="1" height="1">
+ <g>
+ <rect fill="url(#p1)" width="100" height="100"/>
+ </g>
+ </pattern>
+ <pattern id="p1" width="1" height="1">
+ <g>
+ <rect fill="url(#p2)" width="100" height="100"/>
+ </g>
+ </pattern>
+</svg>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (190048 => 190049)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2015-09-21 08:10:21 UTC (rev 190048)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2015-09-21 08:12:28 UTC (rev 190049)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-09-17 Dean Jackson <dino@apple.com>
+
+ Cyclic resources were not detected if the reference had deep containers
+ https://bugs.webkit.org/show_bug.cgi?id=149182
+
+ Reviewed by John Honeycutt.
+
+ During our examination of the SVG rendering tree looking for cycles,
+ if a resource pointed to something that had a nested structure, and
+ one of the parent nodes in that structure was a container object
+ without resources itself, we were not looking into the children.
+
+ Test: svg/custom/pattern-content-cycle-w-resourceless-container.html
+
+ * rendering/svg/SVGResourcesCycleSolver.cpp:
+ (WebCore::SVGResourcesCycleSolver::resourceContainsCycles): We should still
+ check all children resources, but not exit early if there are none. Instead
+ we should recurse into any children.
+ (WebCore::SVGResourcesCycleSolver::resolveCycles): Changes to some debug
+ code that no longer compiled (it's still off by default, but at least
+ it will work now).
+
</ins><span class="cx"> 2015-09-21 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] REGRESSION(188031): ASSERTION FAILED: menu
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingsvgSVGResourcesCycleSolvercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp (190048 => 190049)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp        2015-09-21 08:10:21 UTC (rev 190048)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/svg/SVGResourcesCycleSolver.cpp        2015-09-21 08:12:28 UTC (rev 190049)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx"> HashSet<RenderSVGResourceContainer*> resourceSet;
</span><span class="cx"> resources->buildSetOfResources(resourceSet);
</span><span class="cx">
</span><del>- // Walk all resources and check wheter they reference any resource contained in the resources set.
</del><ins>+ // Walk all resources and check whether they reference any resource contained in the resources set.
</ins><span class="cx"> for (auto* resource : resourceSet) {
</span><span class="cx"> if (m_allResources.contains(resource))
</span><span class="cx"> return true;
</span><span class="lines">@@ -65,18 +65,16 @@
</span><span class="cx"> // <marker id="a"> <path marker-start="url(#b)"/> ...
</span><span class="cx"> // <marker id="b"> <path marker-start="url(#a)"/> ...
</span><span class="cx"> for (auto& child : childrenOfType<RenderElement>(renderer)) {
</span><del>- auto* childResources = SVGResourcesCache::cachedResourcesForRenderer(child);
- if (!childResources)
- continue;
-
- // A child of the given 'resource' contains resources.
- HashSet<RenderSVGResourceContainer*> childResourceSet;
- childResources->buildSetOfResources(childResourceSet);
</del><ins>+ if (auto* childResources = SVGResourcesCache::cachedResourcesForRenderer(child)) {
+ // A child of the given 'resource' contains resources.
+ HashSet<RenderSVGResourceContainer*> childResourceSet;
+ childResources->buildSetOfResources(childResourceSet);
</ins><span class="cx">
</span><del>- // Walk all child resources and check wheter they reference any resource contained in the resources set.
- for (auto* resource : childResourceSet) {
- if (m_allResources.contains(resource))
- return true;
</del><ins>+ // Walk all child resources and check whether they reference any resource contained in the resources set.
+ for (auto* resource : childResourceSet) {
+ if (m_allResources.contains(resource))
+ return true;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Walk children recursively, stop immediately if we found a cycle
</span><span class="lines">@@ -107,15 +105,15 @@
</span><span class="cx"> ancestorResources.add(&resource);
</span><span class="cx">
</span><span class="cx"> #if DEBUG_CYCLE_DETECTION > 0
</span><del>- fprintf(stderr, "\nDetecting wheter any resources references any of following objects:\n");
</del><ins>+ fprintf(stderr, "\nDetecting whether any resources references any of following objects:\n");
</ins><span class="cx"> {
</span><span class="cx"> fprintf(stderr, "Local resources:\n");
</span><del>- for (auto* resource : localResources)
- fprintf(stderr, "|> %s: object=%p (node=%p)\n", resource->renderName(), resource, resource->node());
</del><ins>+ for (RenderObject* resource : localResources)
+ fprintf(stderr, "|> %s : %p (node %p)\n", resource->renderName(), resource, resource->node());
</ins><span class="cx">
</span><span class="cx"> fprintf(stderr, "Parent resources:\n");
</span><del>- for (auto* resource : ancestorResources)
- fprintf(stderr, "|> %s: object=%p (node=%p)\n", resource->renderName(), resource, resource->node());
</del><ins>+ for (RenderObject* resource : ancestorResources)
+ fprintf(stderr, "|> %s : %p (node %p)\n", resource->renderName(), resource, resource->node());
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="lines">@@ -131,7 +129,7 @@
</span><span class="cx"> ASSERT(!m_allResources.isEmpty());
</span><span class="cx">
</span><span class="cx"> // The job of this function is to determine wheter any of the 'resources' associated with the given 'renderer'
</span><del>- // references us (or wheter any of its kids references us) -> that's a cycle, we need to find and break it.
</del><ins>+ // references us (or whether any of its kids references us) -> that's a cycle, we need to find and break it.
</ins><span class="cx"> for (auto* resource : localResources) {
</span><span class="cx"> if (ancestorResources.contains(resource) || resourceContainsCycles(*resource))
</span><span class="cx"> breakCycle(*resource);
</span><span class="lines">@@ -139,7 +137,7 @@
</span><span class="cx">
</span><span class="cx"> #if DEBUG_CYCLE_DETECTION > 0
</span><span class="cx"> fprintf(stderr, "\nAfter cycle detection:\n");
</span><del>- m_resources.dump(m_renderer);
</del><ins>+ m_resources.dump(&m_renderer);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_allResources.clear();
</span></span></pre>
</div>
</div>
</body>
</html>