<!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>[185851] 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/185851">185851</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-06-22 16:32:30 -0700 (Mon, 22 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>-webkit-clip-path clips incorrectly if the element bounds go beyond the top edge of the page
https://bugs.webkit.org/show_bug.cgi?id=146218
rdar://problem/21127840
Reviewed by Zalan Bujtas.
Source/WebCore:
The clip path is computed using the RenderLayer's bounding box, so needs to be offset
by the offsetFromRenderer when set on the mask layer.
Test: compositing/masks/compositing-clip-path-origin.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateMaskingLayerGeometry):
LayoutTests:
Test clip path on layers with non-zero bounds offsetFromRenderer because of box shadow,
or vertical writing mode.
* compositing/masks/compositing-clip-path-origin-expected.html: Added.
* compositing/masks/compositing-clip-path-origin.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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingmaskscompositingclippathoriginexpectedhtml">trunk/LayoutTests/compositing/masks/compositing-clip-path-origin-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingmaskscompositingclippathoriginhtml">trunk/LayoutTests/compositing/masks/compositing-clip-path-origin.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185850 => 185851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-22 23:02:04 UTC (rev 185850)
+++ trunk/LayoutTests/ChangeLog 2015-06-22 23:32:30 UTC (rev 185851)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-22 Simon Fraser <simon.fraser@apple.com>
+
+ -webkit-clip-path clips incorrectly if the element bounds go beyond the top edge of the page
+ https://bugs.webkit.org/show_bug.cgi?id=146218
+ rdar://problem/21127840
+
+ Reviewed by Zalan Bujtas.
+
+ Test clip path on layers with non-zero bounds offsetFromRenderer because of box shadow,
+ or vertical writing mode.
+
+ * compositing/masks/compositing-clip-path-origin-expected.html: Added.
+ * compositing/masks/compositing-clip-path-origin.html: Added.
+
</ins><span class="cx"> 2015-06-22 David Kilzer <ddkilzer@apple.com>
</span><span class="cx">
</span><span class="cx"> fast/text/justify-ideograph-{complex,simple,vertical}.html tests are flaky on El Capitan Debug builds
</span></span></pre></div>
<a id="trunkLayoutTestscompositingmaskscompositingclippathoriginexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/compositing-clip-path-origin-expected.html (0 => 185851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/compositing-clip-path-origin-expected.html (rev 0)
+++ trunk/LayoutTests/compositing/masks/compositing-clip-path-origin-expected.html 2015-06-22 23:32:30 UTC (rev 185851)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ height: 100px;
+ width: 200px;
+ margin: 10px;
+ background-color: green;
+ -webkit-clip-path: inset(20px 2px 0px 0px);
+ }
+
+ .second {
+ box-shadow: 0 0 20px black;
+ }
+
+ .third {
+ -webkit-writing-mode: vertical-rl;
+ }
+
+ .blob {
+ height: 40px;
+ width: 40px;
+ }
+
+ .composited {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ width: 50px;
+ height: 400px;
+ border: 1px solid blue;
+ }
+
+ .composited:hover {
+ -webkit-transform: none;
+ }
+ </style>
+</head>
+<body>
+
+<div class="composited">
+</div>
+
+<div class="box" style="top: 50px;">
+ <div class="blob" style="background-color: orange"></div>
+ <div class="blob" style="background-color: blue"></div>
+</div>
+<div class="second box" style="top: 150px;">
+ <div class="blob" style="background-color: orange"></div>
+ <div class="blob" style="background-color: blue"></div>
+</div>
+
+<div class="third box" style="top: 250px;">
+ <div class="blob" style="background-color: orange"></div>
+ <div class="blob" style="background-color: blue"></div>
+</div>
+
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingmaskscompositingclippathoriginhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/masks/compositing-clip-path-origin.html (0 => 185851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/masks/compositing-clip-path-origin.html (rev 0)
+++ trunk/LayoutTests/compositing/masks/compositing-clip-path-origin.html 2015-06-22 23:32:30 UTC (rev 185851)
</span><span class="lines">@@ -0,0 +1,63 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ height: 100px;
+ width: 200px;
+ margin: 10px;
+ background-color: green;
+ -webkit-clip-path: inset(20px 2px 0px 0px);
+ }
+
+ .second {
+ box-shadow: 0 0 20px black;
+ }
+
+ .third {
+ -webkit-writing-mode: vertical-rl;
+ }
+
+ .blob {
+ height: 40px;
+ width: 40px;
+ }
+
+ .composited {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ width: 50px;
+ height: 400px;
+ border: 1px solid blue;
+ -webkit-transform: translateZ(0);
+ }
+
+ .composited:hover {
+ -webkit-transform: none;
+ }
+ </style>
+</head>
+<body>
+
+<div class="composited">
+</div>
+
+<div class="box" style="top: 50px;">
+ <div class="blob" style="background-color: orange"></div>
+ <div class="blob" style="background-color: blue"></div>
+</div>
+<div class="second box" style="top: 150px;">
+ <div class="blob" style="background-color: orange"></div>
+ <div class="blob" style="background-color: blue"></div>
+</div>
+
+<div class="third box" style="top: 250px;">
+ <div class="blob" style="background-color: orange"></div>
+ <div class="blob" style="background-color: blue"></div>
+</div>
+
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185850 => 185851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-22 23:02:04 UTC (rev 185850)
+++ trunk/Source/WebCore/ChangeLog 2015-06-22 23:32:30 UTC (rev 185851)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-06-22 Simon Fraser <simon.fraser@apple.com>
+
+ -webkit-clip-path clips incorrectly if the element bounds go beyond the top edge of the page
+ https://bugs.webkit.org/show_bug.cgi?id=146218
+ rdar://problem/21127840
+
+ Reviewed by Zalan Bujtas.
+
+ The clip path is computed using the RenderLayer's bounding box, so needs to be offset
+ by the offsetFromRenderer when set on the mask layer.
+
+ Test: compositing/masks/compositing-clip-path-origin.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::updateMaskingLayerGeometry):
+
</ins><span class="cx"> 2015-06-22 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> Web sockets should be treated as active mixed content
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (185850 => 185851)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-06-22 23:02:04 UTC (rev 185850)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-06-22 23:32:30 UTC (rev 185851)
</span><span class="lines">@@ -1061,6 +1061,10 @@
</span><span class="cx"> LayoutSize offset = LayoutSize(snapSizeToDevicePixel(m_devicePixelFractionFromRenderer, LayoutPoint(), deviceScaleFactor()));
</span><span class="cx"> Path clipPath = m_owningLayer.computeClipPath(offset, referenceBoxForClippedInline, windRule);
</span><span class="cx">
</span><ins>+ FloatSize pathOffset = m_maskLayer->offsetFromRenderer();
+ if (!pathOffset.isZero())
+ clipPath.translate(-pathOffset);
+
</ins><span class="cx"> m_maskLayer->setShapeLayerPath(clipPath);
</span><span class="cx"> m_maskLayer->setShapeLayerWindRule(windRule);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>