<!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>[191403] 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/191403">191403</a></dd>
<dt>Author</dt> <dd>dino@apple.com</dd>
<dt>Date</dt> <dd>2015-10-21 14:45:26 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Null dereference loading Blink layout test svg/filters/display-none-filter-primitive.html
https://bugs.webkit.org/show_bug.cgi?id=150212
<rdar://problem/23137376>
Reviewed by Brent Fulgham.
Source/WebCore:
Handle the case where a filter element doesn't have a renderer. Inspired by the Blink
commit:
https://chromium.googlesource.com/chromium/src.git/+/fb79f7fc46552d45127acd2959a23662ad8f271e
Test: svg/filters/display-none-filter-primitive.html
* rendering/svg/RenderSVGResourceFilter.cpp:
(WebCore::RenderSVGResourceFilter::buildPrimitives):
* svg/graphics/filters/SVGFilterBuilder.cpp:
(WebCore::SVGFilterBuilder::appendEffectToEffectReferences):
LayoutTests:
* svg/filters/display-none-filter-primitive-expected.txt: Added.
* svg/filters/display-none-filter-primitive.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="#trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp">trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp</a></li>
<li><a href="#trunkSourceWebCoresvggraphicsfiltersSVGFilterBuildercpp">trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestssvgfiltersdisplaynonefilterprimitiveexpectedtxt">trunk/LayoutTests/svg/filters/display-none-filter-primitive-expected.txt</a></li>
<li><a href="#trunkLayoutTestssvgfiltersdisplaynonefilterprimitivehtml">trunk/LayoutTests/svg/filters/display-none-filter-primitive.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (191402 => 191403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-10-21 21:26:41 UTC (rev 191402)
+++ trunk/LayoutTests/ChangeLog 2015-10-21 21:45:26 UTC (rev 191403)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-10-21 Dean Jackson <dino@apple.com>
+
+ Null dereference loading Blink layout test svg/filters/display-none-filter-primitive.html
+ https://bugs.webkit.org/show_bug.cgi?id=150212
+ <rdar://problem/23137376>
+
+ Reviewed by Brent Fulgham.
+
+ * svg/filters/display-none-filter-primitive-expected.txt: Added.
+ * svg/filters/display-none-filter-primitive.html: Added.
+
</ins><span class="cx"> 2015-10-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Add basic transaction aborting.
</span></span></pre></div>
<a id="trunkLayoutTestssvgfiltersdisplaynonefilterprimitiveexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/filters/display-none-filter-primitive-expected.txt (0 => 191403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/filters/display-none-filter-primitive-expected.txt (rev 0)
+++ trunk/LayoutTests/svg/filters/display-none-filter-primitive-expected.txt 2015-10-21 21:45:26 UTC (rev 191403)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+PASS if no crash
</ins><span class="cx">Property changes on: trunk/LayoutTests/svg/filters/display-none-filter-primitive-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="trunkLayoutTestssvgfiltersdisplaynonefilterprimitivehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/svg/filters/display-none-filter-primitive.html (0 => 191403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/svg/filters/display-none-filter-primitive.html (rev 0)
+++ trunk/LayoutTests/svg/filters/display-none-filter-primitive.html 2015-10-21 21:45:26 UTC (rev 191403)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<!DOCTYPE html>
+<svg>
+ <filter id="f">
+ <feMerge style="display: none">
+ <feMergeNode/>
+ </feMerge>
+ <feDiffuseLighting/>
+ </filter>
+ <rect filter="url(#f)" width="100" height="100"/>
+</svg>
+<p>PASS if no crash</p>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
</ins><span class="cx">\ No newline at end of file
</span><span class="cx">Property changes on: trunk/LayoutTests/svg/filters/display-none-filter-primitive.html
</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 (191402 => 191403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-10-21 21:26:41 UTC (rev 191402)
+++ trunk/Source/WebCore/ChangeLog 2015-10-21 21:45:26 UTC (rev 191403)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-10-21 Dean Jackson <dino@apple.com>
+
+ Null dereference loading Blink layout test svg/filters/display-none-filter-primitive.html
+ https://bugs.webkit.org/show_bug.cgi?id=150212
+ <rdar://problem/23137376>
+
+ Reviewed by Brent Fulgham.
+
+ Handle the case where a filter element doesn't have a renderer. Inspired by the Blink
+ commit:
+ https://chromium.googlesource.com/chromium/src.git/+/fb79f7fc46552d45127acd2959a23662ad8f271e
+
+ Test: svg/filters/display-none-filter-primitive.html
+
+ * rendering/svg/RenderSVGResourceFilter.cpp:
+ (WebCore::RenderSVGResourceFilter::buildPrimitives):
+ * svg/graphics/filters/SVGFilterBuilder.cpp:
+ (WebCore::SVGFilterBuilder::appendEffectToEffectReferences):
+
</ins><span class="cx"> 2015-10-21 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Add basic transaction aborting.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingsvgRenderSVGResourceFiltercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp (191402 => 191403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2015-10-21 21:26:41 UTC (rev 191402)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGResourceFilter.cpp 2015-10-21 21:45:26 UTC (rev 191403)
</span><span class="lines">@@ -90,7 +90,8 @@
</span><span class="cx"> builder->appendEffectToEffectReferences(effect.copyRef(), element.renderer());
</span><span class="cx"> element.setStandardAttributes(effect.get());
</span><span class="cx"> effect->setEffectBoundaries(SVGLengthContext::resolveRectangle<SVGFilterPrimitiveStandardAttributes>(&element, filterElement().primitiveUnits(), targetBoundingBox));
</span><del>- effect->setOperatingColorSpace(element.renderer()->style().svgStyle().colorInterpolationFilters() == CI_LINEARRGB ? ColorSpaceLinearRGB : ColorSpaceDeviceRGB);
</del><ins>+ if (element.renderer())
+ effect->setOperatingColorSpace(element.renderer()->style().svgStyle().colorInterpolationFilters() == CI_LINEARRGB ? ColorSpaceLinearRGB : ColorSpaceDeviceRGB);
</ins><span class="cx"> builder->add(element.result(), WTF::move(effect));
</span><span class="cx"> }
</span><span class="cx"> return builder;
</span></span></pre></div>
<a id="trunkSourceWebCoresvggraphicsfiltersSVGFilterBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp (191402 => 191403)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp 2015-10-21 21:26:41 UTC (rev 191402)
+++ trunk/Source/WebCore/svg/graphics/filters/SVGFilterBuilder.cpp 2015-10-21 21:45:26 UTC (rev 191403)
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> {
</span><span class="cx"> // The effect must be a newly created filter effect.
</span><span class="cx"> ASSERT(!m_effectReferences.contains(effect));
</span><del>- ASSERT(object && !m_effectRenderer.contains(object));
</del><ins>+ ASSERT(!object || !m_effectRenderer.contains(object));
</ins><span class="cx"> m_effectReferences.add(effect, FilterEffectSet());
</span><span class="cx">
</span><span class="cx"> unsigned numberOfInputEffects = effect->inputEffects().size();
</span><span class="lines">@@ -74,7 +74,12 @@
</span><span class="cx"> // It is not possible to add the same value to a set twice.
</span><span class="cx"> for (unsigned i = 0; i < numberOfInputEffects; ++i)
</span><span class="cx"> effectReferences(effect->inputEffect(i)).add(effect.get());
</span><del>- m_effectRenderer.add(object, effect.get());
</del><ins>+
+ // If object is null, that means the element isn't attached for some
+ // reason, which in turn mean that certain types of invalidation will not
+ // work (the LayoutObject -> FilterEffect mapping will not be defined).
+ if (object)
+ m_effectRenderer.add(object, effect.get());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void SVGFilterBuilder::clearEffects()
</span></span></pre>
</div>
</div>
</body>
</html>