<!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>[209697] 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/209697">209697</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-12-11 20:58:02 -0800 (Sun, 11 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/200283">r200283</a>): Transform, overflow hidden and filter combination completely hides the element
https://bugs.webkit.org/show_bug.cgi?id=161509
Reviewed by David Hyatt.
Source/WebCore:
When the filter painting code needs to recompute a paintDirtyRect, it was using selfClipRect()
which is obviously wrong because it returns a rect in absolute coordinates. Use code factored
out of localClipRect() instead, which returns a rect relative to the painting root.
Test: css3/filters/filter-on-overflow-hidden.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::paintLayerContents):
LayoutTests:
* css3/filters/filter-on-overflow-hidden-expected.html: Added.
* css3/filters/filter-on-overflow-hidden.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>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscss3filtersfilteronoverflowhiddenexpectedhtml">trunk/LayoutTests/css3/filters/filter-on-overflow-hidden-expected.html</a></li>
<li><a href="#trunkLayoutTestscss3filtersfilteronoverflowhiddenhtml">trunk/LayoutTests/css3/filters/filter-on-overflow-hidden.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (209696 => 209697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-12-12 03:11:18 UTC (rev 209696)
+++ trunk/LayoutTests/ChangeLog 2016-12-12 04:58:02 UTC (rev 209697)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-12-11 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r200283): Transform, overflow hidden and filter combination completely hides the element
+ https://bugs.webkit.org/show_bug.cgi?id=161509
+
+ Reviewed by David Hyatt.
+
+ * css3/filters/filter-on-overflow-hidden-expected.html: Added.
+ * css3/filters/filter-on-overflow-hidden.html: Added.
+
</ins><span class="cx"> 2016-12-11 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove uses of Dictionary in WebRTC IDL files
</span></span></pre></div>
<a id="trunkLayoutTestscss3filtersfilteronoverflowhiddenexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/filter-on-overflow-hidden-expected.html (0 => 209697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/filter-on-overflow-hidden-expected.html (rev 0)
+++ trunk/LayoutTests/css3/filters/filter-on-overflow-hidden-expected.html 2016-12-12 04:58:02 UTC (rev 209697)
</span><span class="lines">@@ -0,0 +1,43 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .parent {
+ position: absolute;
+ top: 50px;
+ left: 50px;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ outline: 1px solid black;
+ transform: translateZ(0);
+ }
+ .box {
+ height: 100%;
+ width: 100%;
+ overflow: hidden;
+ background-color: green;
+ }
+
+ .masker {
+ position: absolute;
+ top: 65px;
+ left: 65px;
+ width: 90px;
+ height: 90px;
+ border: 10px solid black;
+ }
+
+ </style>
+</head>
+<body>
+ <div class="parent">
+ <div class="box">
+ </div>
+ </div>
+
+ <div class="masker">
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestscss3filtersfilteronoverflowhiddenhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/css3/filters/filter-on-overflow-hidden.html (0 => 209697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/css3/filters/filter-on-overflow-hidden.html (rev 0)
+++ trunk/LayoutTests/css3/filters/filter-on-overflow-hidden.html 2016-12-12 04:58:02 UTC (rev 209697)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .parent {
+ position: absolute;
+ top: 50px;
+ left: 50px;
+ width: 100px;
+ height: 100px;
+ padding: 20px;
+ outline: 1px solid black;
+ transform: translateZ(0);
+ }
+ .box {
+ height: 100%;
+ width: 100%;
+ overflow: hidden;
+ background-color: green;
+ filter: blur(2px);
+ }
+
+ .masker {
+ position: absolute;
+ top: 65px;
+ left: 65px;
+ width: 90px;
+ height: 90px;
+ border: 10px solid black;
+ }
+
+ </style>
+</head>
+<body>
+ <div class="parent">
+ <div class="box">
+ </div>
+ </div>
+
+ <div class="masker">
+ </div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209696 => 209697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-12 03:11:18 UTC (rev 209696)
+++ trunk/Source/WebCore/ChangeLog 2016-12-12 04:58:02 UTC (rev 209697)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-12-11 Simon Fraser <simon.fraser@apple.com>
+
+ REGRESSION (r200283): Transform, overflow hidden and filter combination completely hides the element
+ https://bugs.webkit.org/show_bug.cgi?id=161509
+
+ Reviewed by David Hyatt.
+
+ When the filter painting code needs to recompute a paintDirtyRect, it was using selfClipRect()
+ which is obviously wrong because it returns a rect in absolute coordinates. Use code factored
+ out of localClipRect() instead, which returns a rect relative to the painting root.
+
+ Test: css3/filters/filter-on-overflow-hidden.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::paintLayerContents):
+
</ins><span class="cx"> 2016-12-11 Saam Barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> We should be able to throw exceptions from Wasm code and when Wasm frames are on the stack
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (209696 => 209697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-12-12 03:11:18 UTC (rev 209696)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2016-12-12 04:58:02 UTC (rev 209697)
</span><span class="lines">@@ -4390,7 +4390,7 @@
</span><span class="cx"> if (!localPaintingInfo.clipToDirtyRect && renderer().hasOverflowClip()) {
</span><span class="cx"> // We can turn clipping back by requesting full repaint for the overflow area.
</span><span class="cx"> localPaintingInfo.clipToDirtyRect = true;
</span><del>- paintDirtyRect = selfClipRect();
</del><ins>+ paintDirtyRect = clipRectRelativeToAncestor(localPaintingInfo.rootLayer, offsetFromRoot, LayoutRect::infiniteRect());
</ins><span class="cx"> }
</span><span class="cx"> collectFragments(layerFragments, localPaintingInfo.rootLayer, paintDirtyRect, ExcludeCompositedPaginatedLayers,
</span><span class="cx"> (localPaintFlags & PaintLayerTemporaryClipRects) ? TemporaryClipRects : PaintingClipRects, IgnoreOverlayScrollbarSize,
</span><span class="lines">@@ -5769,18 +5769,24 @@
</span><span class="cx"> return clippingRootLayer->renderer().localToAbsoluteQuad(FloatQuad(foregroundRect.rect())).enclosingBoundingBox();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+LayoutRect RenderLayer::clipRectRelativeToAncestor(RenderLayer* ancestor, LayoutSize offsetFromAncestor, const LayoutRect& constrainingRect) const
+{
+ LayoutRect layerBounds;
+ ClipRect backgroundRect;
+ ClipRect foregroundRect;
+ auto clipRectType = !m_enclosingPaginationLayer || m_enclosingPaginationLayer == ancestor ? PaintingClipRects : TemporaryClipRects;
+ ClipRectsContext clipRectsContext(ancestor, clipRectType);
+ calculateRects(clipRectsContext, constrainingRect, layerBounds, backgroundRect, foregroundRect, offsetFromAncestor);
+ return backgroundRect.rect();
+}
+
</ins><span class="cx"> LayoutRect RenderLayer::selfClipRect() const
</span><span class="cx"> {
</span><span class="cx"> // FIXME: border-radius not accounted for.
</span><span class="cx"> // FIXME: Regions not accounted for.
</span><span class="cx"> RenderLayer* clippingRootLayer = clippingRootForPainting();
</span><del>- LayoutRect layerBounds;
- ClipRect backgroundRect;
- ClipRect foregroundRect;
- auto clipRectType = !m_enclosingPaginationLayer || m_enclosingPaginationLayer == clippingRootLayer ? PaintingClipRects : TemporaryClipRects;
- ClipRectsContext clipRectsContext(clippingRootLayer, clipRectType);
- calculateRects(clipRectsContext, renderer().view().documentRect(), layerBounds, backgroundRect, foregroundRect, offsetFromAncestor(clippingRootLayer));
- return clippingRootLayer->renderer().localToAbsoluteQuad(FloatQuad(backgroundRect.rect())).enclosingBoundingBox();
</del><ins>+ LayoutRect clipRect = clipRectRelativeToAncestor(clippingRootLayer, offsetFromAncestor(clippingRootLayer), renderer().view().documentRect());
+ return clippingRootLayer->renderer().localToAbsoluteQuad(FloatQuad(clipRect)).enclosingBoundingBox();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> LayoutRect RenderLayer::localClipRect(bool& clipExceedsBounds) const
</span><span class="lines">@@ -5790,15 +5796,7 @@
</span><span class="cx"> // FIXME: Regions not accounted for.
</span><span class="cx"> RenderLayer* clippingRootLayer = clippingRootForPainting();
</span><span class="cx"> LayoutSize offsetFromRoot = offsetFromAncestor(clippingRootLayer);
</span><del>-
- LayoutRect layerBounds;
- ClipRect backgroundRect;
- ClipRect foregroundRect;
- auto clipRectType = !m_enclosingPaginationLayer || m_enclosingPaginationLayer == clippingRootLayer ? PaintingClipRects : TemporaryClipRects;
- ClipRectsContext clipRectsContext(clippingRootLayer, clipRectType);
- calculateRects(clipRectsContext, LayoutRect::infiniteRect(), layerBounds, backgroundRect, foregroundRect, offsetFromRoot);
-
- LayoutRect clipRect = backgroundRect.rect();
</del><ins>+ LayoutRect clipRect = clipRectRelativeToAncestor(clippingRootLayer, offsetFromRoot, LayoutRect::infiniteRect());
</ins><span class="cx"> if (clipRect.isInfinite())
</span><span class="cx"> return clipRect;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (209696 => 209697)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2016-12-12 03:11:18 UTC (rev 209696)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2016-12-12 04:58:02 UTC (rev 209697)
</span><span class="lines">@@ -726,6 +726,8 @@
</span><span class="cx"> void computeRepaintRectsIncludingDescendants();
</span><span class="cx"> void clearRepaintRects();
</span><span class="cx">
</span><ins>+ LayoutRect clipRectRelativeToAncestor(RenderLayer* ancestor, LayoutSize offsetFromAncestor, const LayoutRect& constrainingRect) const;
+
</ins><span class="cx"> void clipToRect(GraphicsContext&, const LayerPaintingInfo&, const ClipRect&, BorderRadiusClippingRule = IncludeSelfForBorderRadius);
</span><span class="cx"> void restoreClip(GraphicsContext&, const LayerPaintingInfo&, const ClipRect&);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>