<!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>[199361] 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/199361">199361</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-12 09:27:45 -0700 (Tue, 12 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/198075">r198075</a> - REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/188647">r188647</a>): Teamtreehouse website sidebar buttons are not rendered
https://bugs.webkit.org/show_bug.cgi?id=155400
<rdar://problem/24818602>
Reviewed by Anders Carlsson.
Source/WebCore:
When we unprefixed CSS filters we accidentally
stopped SVG elements that use the CSS filter shorthands
from rendering. We still don't actually support
the shorthands in this case, but we should render
the element without the filter.
Tests: css3/filters/filters-on-svg-element.html
css3/filters/filters-on-svg-root.html
* rendering/style/RenderStyle.cpp:
(WebCore::RenderStyle::hasReferenceFilterOnly): Add
this new function that tells us if we have the
style of filter that we can handle in SVG content.
* rendering/style/RenderStyle.h:
* rendering/svg/SVGRenderingContext.cpp:
(WebCore::SVGRenderingContext::prepareToRenderSVGContent):
We can mark an element as ready to render if it
has a shorthand filter.
LayoutTests:
Add tests with SVG content that uses CSS filter
shorthands. These particular filters are no-ops
so should not affect rendering. If they actually
tried to do something you wouldn't see them work
until we enable shorthand filters on SVG content.
* css3/filters/filters-on-svg-element-expected.html: Added.
* css3/filters/filters-on-svg-element.html: Added.
* css3/filters/filters-on-svg-root-expected.html: Added.
* css3/filters/filters-on-svg-root.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="#releasesWebKitGTKwebkit212SourceWebCorerenderingstyleRenderStylecpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingstyleRenderStyleh">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingsvgSVGRenderingContextcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/svg/SVGRenderingContext.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestscss3filtersfiltersonsvgelementexpectedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-element-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestscss3filtersfiltersonsvgelementhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-element.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestscss3filtersfiltersonsvgrootexpectedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-root-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestscss3filtersfiltersonsvgroothtml">releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-root.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 (199360 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-12 16:21:50 UTC (rev 199360)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-03-12 Dean Jackson <dino@apple.com>
+
+ REGRESSION (r188647): Teamtreehouse website sidebar buttons are not rendered
+ https://bugs.webkit.org/show_bug.cgi?id=155400
+ <rdar://problem/24818602>
+
+ Reviewed by Anders Carlsson.
+
+ Add tests with SVG content that uses CSS filter
+ shorthands. These particular filters are no-ops
+ so should not affect rendering. If they actually
+ tried to do something you wouldn't see them work
+ until we enable shorthand filters on SVG content.
+
+ * css3/filters/filters-on-svg-element-expected.html: Added.
+ * css3/filters/filters-on-svg-element.html: Added.
+ * css3/filters/filters-on-svg-root-expected.html: Added.
+ * css3/filters/filters-on-svg-root.html: Added.
+
</ins><span class="cx"> 2016-03-11 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit should not be redirected to an invalid URL
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestscss3filtersfiltersonsvgelementexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-element-expected.html (0 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-element-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-element-expected.html 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<svg viewBox="0 0 20 20" width="100px" height="100px">
+ <rect width="20" height="20" fill="red"/>
+ <circle cx="10" cy="10" r="8"/>
+</svg>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestscss3filtersfiltersonsvgelementhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-element.html (0 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-element.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-element.html 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<style>
+rect {
+ filter: blur(0);
+}
+</style>
+<svg viewBox="0 0 20 20" width="100px" height="100px">
+ <rect width="20" height="20" fill="red"/>
+ <circle cx="10" cy="10" r="8"/>
+</svg>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestscss3filtersfiltersonsvgrootexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-root-expected.html (0 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-root-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-root-expected.html 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+<svg viewBox="0 0 20 20" width="100px" height="100px">
+ <rect width="20" height="20" fill="red"/>
+ <circle cx="10" cy="10" r="8"/>
+</svg>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestscss3filtersfiltersonsvgroothtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-root.html (0 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-root.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/css3/filters/filters-on-svg-root.html 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+<style>
+svg {
+ filter: blur(0);
+}
+</style>
+<svg viewBox="0 0 20 20" width="100px" height="100px">
+ <rect width="20" height="20" fill="red"/>
+ <circle cx="10" cy="10" r="8"/>
+</svg>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (199360 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-12 16:21:50 UTC (rev 199360)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-03-12 Dean Jackson <dino@apple.com>
+
+ REGRESSION (r188647): Teamtreehouse website sidebar buttons are not rendered
+ https://bugs.webkit.org/show_bug.cgi?id=155400
+ <rdar://problem/24818602>
+
+ Reviewed by Anders Carlsson.
+
+ When we unprefixed CSS filters we accidentally
+ stopped SVG elements that use the CSS filter shorthands
+ from rendering. We still don't actually support
+ the shorthands in this case, but we should render
+ the element without the filter.
+
+ Tests: css3/filters/filters-on-svg-element.html
+ css3/filters/filters-on-svg-root.html
+
+ * rendering/style/RenderStyle.cpp:
+ (WebCore::RenderStyle::hasReferenceFilterOnly): Add
+ this new function that tells us if we have the
+ style of filter that we can handle in SVG content.
+ * rendering/style/RenderStyle.h:
+ * rendering/svg/SVGRenderingContext.cpp:
+ (WebCore::SVGRenderingContext::prepareToRenderSVGContent):
+ We can mark an element as ready to render if it
+ has a shorthand filter.
+
</ins><span class="cx"> 2016-03-11 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><span class="cx"> WebKit should not be redirected to an invalid URL
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.cpp (199360 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.cpp 2016-04-12 16:21:50 UTC (rev 199360)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.cpp 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -1975,6 +1975,22 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+bool RenderStyle::hasReferenceFilterOnly() const
+{
+ if (!hasFilter())
+ return false;
+
+ const FilterOperations& filterOperations = rareNonInheritedData->m_filter->m_operations;
+ if (filterOperations.size() != 1)
+ return false;
+
+ const FilterOperation& filterOperation = *filterOperations.at(0);
+ if (filterOperation.type() != FilterOperation::REFERENCE)
+ return false;
+
+ return true;
+}
+
</ins><span class="cx"> void RenderStyle::checkVariablesInCustomProperties()
</span><span class="cx"> {
</span><span class="cx"> if (!rareInheritedData->m_customProperties->containsVariables())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.h (199360 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.h 2016-04-12 16:21:50 UTC (rev 199360)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/style/RenderStyle.h 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -1159,6 +1159,7 @@
</span><span class="cx"> FilterOperations& mutableFilter() { return rareNonInheritedData.access()->m_filter.access()->m_operations; }
</span><span class="cx"> const FilterOperations& filter() const { return rareNonInheritedData->m_filter->m_operations; }
</span><span class="cx"> bool hasFilter() const { return !rareNonInheritedData->m_filter->m_operations.operations().isEmpty(); }
</span><ins>+ bool hasReferenceFilterOnly() const;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(FILTERS_LEVEL_2)
</span><span class="cx"> FilterOperations& mutableBackdropFilter() { return rareNonInheritedData.access()->m_backdropFilter.access()->m_operations; }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingsvgSVGRenderingContextcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/svg/SVGRenderingContext.cpp (199360 => 199361)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2016-04-12 16:21:50 UTC (rev 199360)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/svg/SVGRenderingContext.cpp 2016-04-12 16:27:45 UTC (rev 199361)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx">
</span><span class="cx"> auto* resources = SVGResourcesCache::cachedResourcesForRenderer(*m_renderer);
</span><span class="cx"> if (!resources) {
</span><del>- if (style.hasFilter())
</del><ins>+ if (style.hasReferenceFilterOnly())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_renderingFlags |= RenderingPrepared;
</span></span></pre>
</div>
</div>
</body>
</html>