<!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>[212038] 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/212038">212038</a></dd>
<dt>Author</dt> <dd>pdr@google.com</dd>
<dt>Date</dt> <dd>2017-02-09 19:27:40 -0800 (Thu, 09 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>SVG clip-path references can clip out later content
https://bugs.webkit.org/show_bug.cgi?id=164181
Reviewed by Said Abou-Hallawa.
Source/WebCore:
RenderSVGResourceClipper can modify the GraphicsContext state (through the path-only
clipping codepath) so we need to ensure RenderLayer::setupClipPath saves the context
and its caller restores it back so later content is not clipped as well.
This patch is based on a chromium patch by fs@opera.com:
https://chromium.googlesource.com/chromium/src/+/b3f7e7d2c4afb3c7e5c7eb438ff5933cbe2109b3
Test: css3/masking/clip-path-reference-restore.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::setupClipPath): Add a GC save and return true to restore. Also switch to downcast instead of static_cast.
LayoutTests:
Make sure applying multiple clip-path references does not clip out later content.
* css3/masking/clip-path-reference-restore-expected.html: Added.
* css3/masking/clip-path-reference-restore.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="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3maskingclippathreferencerestoreexpectedhtml">trunk/LayoutTests/css3/masking/clip-path-reference-restore-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3maskingclippathreferencerestorehtml">trunk/LayoutTests/css3/masking/clip-path-reference-restore.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (212037 => 212038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-02-10 03:02:25 UTC (rev 212037)
+++ trunk/LayoutTests/ChangeLog 2017-02-10 03:27:40 UTC (rev 212038)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-02-09 Philip Rogers <pdr@google.com>
+
+ SVG clip-path references can clip out later content
+ https://bugs.webkit.org/show_bug.cgi?id=164181
+
+ Reviewed by Said Abou-Hallawa.
+
+ Make sure applying multiple clip-path references does not clip out later content.
+
+ * css3/masking/clip-path-reference-restore-expected.html: Added.
+ * css3/masking/clip-path-reference-restore.html: Added.
+
</ins><span class="cx"> 2017-02-09 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> SharedArrayBuffer does not need to be in the transfer list
</span></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathreferencerestoreexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-reference-restore-expected.html (0 => 212038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-reference-restore-expected.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-reference-restore-expected.html 2017-02-10 03:27:40 UTC (rev 212038)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+<!DOCTYPE html>
+<div style="width: 100px; height: 100px; background-color: green;"></div>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3maskingclippathreferencerestorehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/masking/clip-path-reference-restore.html (0 => 212038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/masking/clip-path-reference-restore.html (rev 0)
+++ trunk/LayoutTests/css3/masking/clip-path-reference-restore.html 2017-02-10 03:27:40 UTC (rev 212038)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+<!DOCTYPE html>
+<style>
+ .error {
+ width: 100px;
+ height: 100px;
+ background-color: red;
+ position: absolute;
+ }
+ .test {
+ width: 200px;
+ height: 50px;
+ background-color: green;
+ -webkit-clip-path: url(#c);
+ }
+</style>
+<div class="error"></div>
+<div class="test"></div>
+<div class="test"></div>
+<svg>
+ <defs>
+ <clipPath id="c" clipPathUnits="objectBoundingBox">
+ <rect width="0.5" height="1"/>
+ </clipPath>
+ </defs>
+</svg>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212037 => 212038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-10 03:02:25 UTC (rev 212037)
+++ trunk/Source/WebCore/ChangeLog 2017-02-10 03:27:40 UTC (rev 212038)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-02-09 Philip Rogers <pdr@google.com>
+
+ SVG clip-path references can clip out later content
+ https://bugs.webkit.org/show_bug.cgi?id=164181
+
+ Reviewed by Said Abou-Hallawa.
+
+ RenderSVGResourceClipper can modify the GraphicsContext state (through the path-only
+ clipping codepath) so we need to ensure RenderLayer::setupClipPath saves the context
+ and its caller restores it back so later content is not clipped as well.
+
+ This patch is based on a chromium patch by fs@opera.com:
+ https://chromium.googlesource.com/chromium/src/+/b3f7e7d2c4afb3c7e5c7eb438ff5933cbe2109b3
+
+ Test: css3/masking/clip-path-reference-restore.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::setupClipPath): Add a GC save and return true to restore. Also switch to downcast instead of static_cast.
+
</ins><span class="cx"> 2017-02-09 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> SharedArrayBuffer does not need to be in the transfer list
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (212037 => 212038)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-02-10 03:02:25 UTC (rev 212037)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2017-02-10 03:27:40 UTC (rev 212038)
</span><span class="lines">@@ -4170,9 +4170,9 @@
</span><span class="cx"> ReferenceClipPathOperation* referenceClipPathOperation = static_cast<ReferenceClipPathOperation*>(style.clipPath());
</span><span class="cx"> Element* element = renderer().document().getElementById(referenceClipPathOperation->fragment());
</span><span class="cx"> if (element && element->hasTagName(SVGNames::clipPathTag) && element->renderer()) {
</span><del>- // FIXME: This should use a safer cast such as toRenderSVGResourceContainer().
- // FIXME: Should this do a context.save() and return true so we restore the context?
- static_cast<RenderSVGResourceClipper*>(element->renderer())->applyClippingToContext(renderer(), rootRelativeBounds, paintingInfo.paintDirtyRect, context);
</del><ins>+ context.save();
+ downcast<RenderSVGResourceClipper>(*element->renderer()).applyClippingToContext(renderer(), rootRelativeBounds, paintingInfo.paintDirtyRect, context);
+ return true;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>