<!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>[172146] 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/172146">172146</a></dd>
<dt>Author</dt> <dd>stavila@adobe.com</dd>
<dt>Date</dt> <dd>2014-08-06 08:06:08 -0700 (Wed, 06 Aug 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/163382">r163382</a>): Overflow hidden for inner elements breaks blurring
https://bugs.webkit.org/show_bug.cgi?id=135318

Reviewed by Zalan Bujtas.

Source/WebCore:

For elements with border radius, clipping must be applied using clipRoundedRect.
This regressed in <a href="http://trac.webkit.org/projects/webkit/changeset/163382">r163382</a>, when normal clipping started being applied also
for elements having border radius.

Test: fast/filter-image/clipped-filter.html

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::clipToRect):
(WebCore::RenderLayer::restoreClip):

LayoutTests:

Added test for filter applied on an element overflowing its parent, which has overflow:hidden.

* fast/filter-image/clipped-filter-expected.html: Added.
* fast/filter-image/clipped-filter.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="#trunkLayoutTestsfastfilterimageclippedfilterexpectedhtml">trunk/LayoutTests/fast/filter-image/clipped-filter-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastfilterimageclippedfilterhtml">trunk/LayoutTests/fast/filter-image/clipped-filter.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172145 => 172146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-08-06 15:04:09 UTC (rev 172145)
+++ trunk/LayoutTests/ChangeLog        2014-08-06 15:06:08 UTC (rev 172146)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-08-06  Radu Stavila  &lt;stavila@adobe.com&gt;
+
+        REGRESSION (r163382): Overflow hidden for inner elements breaks blurring
+        https://bugs.webkit.org/show_bug.cgi?id=135318
+
+        Reviewed by Zalan Bujtas.
+
+        Added test for filter applied on an element overflowing its parent, which has overflow:hidden.
+
+        * fast/filter-image/clipped-filter-expected.html: Added.
+        * fast/filter-image/clipped-filter.html: Added.
+
</ins><span class="cx"> 2014-08-06  Mihnea Ovidenie  &lt;mihnea@adobe.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [CSSRegions] Move selection tests under fast/regions/selection
</span></span></pre></div>
<a id="trunkLayoutTestsfastfilterimageclippedfilterexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/filter-image/clipped-filter-expected.html (0 => 172146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/filter-image/clipped-filter-expected.html                                (rev 0)
+++ trunk/LayoutTests/fast/filter-image/clipped-filter-expected.html        2014-08-06 15:06:08 UTC (rev 172146)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        .circle {
+            width: 300px;
+            height: 300px;
+            margin-left: 100px;
+            margin-top: 60px;
+            background-color: #f5ad61;
+            border-radius: 50% 50%;
+        }
+        .inner {
+            -webkit-filter: drop-shadow(16px 16px 0px black);
+            background-color: red;
+            height: 60px;
+            width: 200px;
+        }
+
+        #clip {
+            position: absolute;
+            top: 0px;
+            left: 0px;
+            width: 500px;
+            height: 500px;
+            background-color: white;
+            -webkit-clip-path: url(#clipPath);
+        }
+    &lt;/style&gt;
+&lt;/head&gt;
+
+&lt;body&gt;
+    &lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=135318&quot;&gt;Bug 135318 - This test passes if the red element has a black shadow and is clipped by the orange circle&lt;/a&gt;
+
+    &lt;div class=&quot;circle&quot;&gt;
+        &lt;div class=&quot;inner&quot;&gt;&lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div id=&quot;clip&quot;&gt;&lt;/div&gt;
+&lt;/body&gt;
+
+&lt;svg&gt;
+    &lt;defs&gt;
+        &lt;clipPath id=&quot;clipPath&quot;&gt;
+            &lt;path d=&quot;M18,38 v200 h90 a150,150 0 0,1 300,0 h50 v-200 z&quot;
+        &lt;/clipPath&gt;
+    &lt;/defs&gt;
+&lt;/svg&gt;
+
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkLayoutTestsfastfilterimageclippedfilterhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/filter-image/clipped-filter.html (0 => 172146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/filter-image/clipped-filter.html                                (rev 0)
+++ trunk/LayoutTests/fast/filter-image/clipped-filter.html        2014-08-06 15:06:08 UTC (rev 172146)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        .circle {
+            width: 300px;
+            height: 300px;
+            margin-left: 100px;
+            margin-top: 60px;
+            background-color: #f5ad61;
+            overflow: hidden;
+            border-radius: 50% 50%;
+        }
+
+        .inner {
+            -webkit-filter: drop-shadow(16px 16px 0px black);
+            background-color: red;
+            height: 60px;
+            width: 200px;
+        }
+
+        #clip {
+            position: absolute;
+            top: 0px;
+            left: 0px;
+            width: 500px;
+            height: 500px;
+            background-color: white;
+            -webkit-clip-path: url(#clipPath);
+        }
+    &lt;/style&gt;
+&lt;/head&gt;
+
+&lt;body&gt;
+    &lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=135318&quot;&gt;Bug 135318 - This test passes if the red element has a black shadow and is clipped by the orange circle&lt;/a&gt;
+
+    &lt;div class=&quot;circle&quot;&gt;
+        &lt;div class=&quot;inner&quot;&gt;&lt;/div&gt;
+    &lt;/div&gt;
+
+    &lt;div id=&quot;clip&quot;&gt;&lt;/div&gt;
+&lt;/body&gt;
+
+&lt;svg&gt;
+    &lt;defs&gt;
+        &lt;clipPath id=&quot;clipPath&quot;&gt;
+            &lt;path d=&quot;M18,38 v200 h90 a150,150 0 0,1 300,0 h50 v-200 z&quot;
+        &lt;/clipPath&gt;
+    &lt;/defs&gt;
+&lt;/svg&gt;
+
+&lt;/html&gt;
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172145 => 172146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-06 15:04:09 UTC (rev 172145)
+++ trunk/Source/WebCore/ChangeLog        2014-08-06 15:06:08 UTC (rev 172146)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-06  Radu Stavila  &lt;stavila@adobe.com&gt;
+
+        REGRESSION (r163382): Overflow hidden for inner elements breaks blurring
+        https://bugs.webkit.org/show_bug.cgi?id=135318
+
+        Reviewed by Zalan Bujtas.
+
+        For elements with border radius, clipping must be applied using clipRoundedRect.
+        This regressed in r163382, when normal clipping started being applied also
+        for elements having border radius.
+
+        Test: fast/filter-image/clipped-filter.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::clipToRect):
+        (WebCore::RenderLayer::restoreClip):
+
</ins><span class="cx"> 2014-08-06  Zalan Bujtas  &lt;zalan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Cleanup InlineTextBox::paintSelection and ::localSelectionRect.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (172145 => 172146)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-08-06 15:04:09 UTC (rev 172145)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-08-06 15:06:08 UTC (rev 172146)
</span><span class="lines">@@ -3586,36 +3586,34 @@
</span><span class="cx"> void RenderLayer::clipToRect(const LayerPaintingInfo&amp; paintingInfo, GraphicsContext* context, const ClipRect&amp; clipRect, BorderRadiusClippingRule rule)
</span><span class="cx"> {
</span><span class="cx">     float deviceScaleFactor = renderer().document().deviceScaleFactor();
</span><del>-    if (clipRect.rect() != paintingInfo.paintDirtyRect || clipRect.hasRadius()) {
</del><ins>+    if (clipRect.hasRadius()) {
</ins><span class="cx">         context-&gt;save();
</span><ins>+        
+        // If the clip rect has been tainted by a border radius, then we have to walk up our layer chain applying the clips from
+        // any layers with overflow. The condition for being able to apply these clips is that the overflow object be in our
+        // containing block chain so we check that also.
+        for (RenderLayer* layer = rule == IncludeSelfForBorderRadius ? this : parent(); layer; layer = layer-&gt;parent()) {
+            if (layer-&gt;renderer().hasOverflowClip() &amp;&amp; layer-&gt;renderer().style().hasBorderRadius() &amp;&amp; inContainingBlockChain(this, layer)) {
+                LayoutRect adjustedClipRect = LayoutRect(toLayoutPoint(layer-&gt;offsetFromAncestor(paintingInfo.rootLayer)), layer-&gt;size());
+                adjustedClipRect.move(paintingInfo.subpixelAccumulation);
+                context-&gt;clipRoundedRect(layer-&gt;renderer().style().getRoundedInnerBorderFor(adjustedClipRect).pixelSnappedRoundedRectForPainting(deviceScaleFactor));
+            }
+            
+            if (layer == paintingInfo.rootLayer)
+                break;
+        }
+    } else if (clipRect.rect() != paintingInfo.paintDirtyRect) {
+        context-&gt;save();
</ins><span class="cx">         LayoutRect adjustedClipRect = clipRect.rect();
</span><span class="cx">         adjustedClipRect.move(paintingInfo.subpixelAccumulation);
</span><span class="cx">         context-&gt;clip(pixelSnappedForPainting(adjustedClipRect, deviceScaleFactor));
</span><span class="cx">     }
</span><del>-
-    if (!clipRect.hasRadius())
-        return;
-
-    // If the clip rect has been tainted by a border radius, then we have to walk up our layer chain applying the clips from
-    // any layers with overflow. The condition for being able to apply these clips is that the overflow object be in our
-    // containing block chain so we check that also.
-    for (RenderLayer* layer = rule == IncludeSelfForBorderRadius ? this : parent(); layer; layer = layer-&gt;parent()) {
-        if (layer-&gt;renderer().hasOverflowClip() &amp;&amp; layer-&gt;renderer().style().hasBorderRadius() &amp;&amp; inContainingBlockChain(this, layer)) {
-            LayoutRect adjustedClipRect = LayoutRect(toLayoutPoint(layer-&gt;offsetFromAncestor(paintingInfo.rootLayer)), layer-&gt;size());
-            adjustedClipRect.move(paintingInfo.subpixelAccumulation);
-            context-&gt;clipRoundedRect(layer-&gt;renderer().style().getRoundedInnerBorderFor(adjustedClipRect).pixelSnappedRoundedRectForPainting(deviceScaleFactor));
-        }
-
-        if (layer == paintingInfo.rootLayer)
-            break;
-    }
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderLayer::restoreClip(GraphicsContext* context, const LayoutRect&amp; paintDirtyRect, const ClipRect&amp; clipRect)
</span><span class="cx"> {
</span><del>-    if (clipRect.rect() == paintDirtyRect &amp;&amp; !clipRect.hasRadius())
-        return;
-    context-&gt;restore();
</del><ins>+    if (clipRect.rect() != paintDirtyRect || clipRect.hasRadius())
+        context-&gt;restore();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static void performOverlapTests(OverlapTestRequestMap&amp; overlapTestRequests, const RenderLayer* rootLayer, const RenderLayer* layer)
</span></span></pre>
</div>
</div>

</body>
</html>