<!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>[179147] 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/179147">179147</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-01-26 14:59:40 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix Border-radius clipping issue on a composited descendants
Source/WebCore:
https://bugs.webkit.org/show_bug.cgi?id=138551
Patch by Byungseon Shin <sun.shin@lge.com> on 2015-01-26
Reviewed by Simon Fraser.
Fix assertion in RenderLayerBacking::paintIntoLayer
by not checking out of sync with the GraphicsLayer heirarchy
in GraphicsLayerPaintChildClippingMask phase.
Test: compositing/clipping/border-radius-overflow-hidden-stacking-context.html
* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::paintIntoLayer):
LayoutTests:
https://bugs.webkit.org/show_bug.cgi?id=138551
Patch by Byungseon Shin <sun.shin@lge.com> on 2015-01-26
Reviewed by Simon Fraser.
Ref test that clips composited descendant by stacking context with border-radius and overflow hidden element.
* compositing/clipping/border-radius-overflow-hidden-stacking-context-expected.txt: Added.
* compositing/clipping/border-radius-overflow-hidden-stacking-context.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>trunk/LayoutTests/compositing/clipping/</li>
<li><a href="#trunkLayoutTestscompositingclippingborderradiusoverflowhiddenstackingcontextexpectedtxt">trunk/LayoutTests/compositing/clipping/border-radius-overflow-hidden-stacking-context-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingclippingborderradiusoverflowhiddenstackingcontexthtml">trunk/LayoutTests/compositing/clipping/border-radius-overflow-hidden-stacking-context.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (179146 => 179147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-01-26 22:50:15 UTC (rev 179146)
+++ trunk/LayoutTests/ChangeLog 2015-01-26 22:59:40 UTC (rev 179147)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-01-26 Byungseon Shin <sun.shin@lge.com>
+
+ Fix Border-radius clipping issue on a composited descendants
+ https://bugs.webkit.org/show_bug.cgi?id=138551
+
+ Reviewed by Simon Fraser.
+
+ Ref test that clips composited descendant by stacking context with border-radius and overflow hidden element.
+
+ * compositing/clipping/border-radius-overflow-hidden-stacking-context-expected.txt: Added.
+ * compositing/clipping/border-radius-overflow-hidden-stacking-context.html: Added.
+
</ins><span class="cx"> 2015-01-26 Benjamin Poulain <benjamin@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix CSS Selector's tag name matching when mixing HTML and XML
</span></span></pre></div>
<a id="trunkLayoutTestscompositingclippingborderradiusoverflowhiddenstackingcontextexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/clipping/border-radius-overflow-hidden-stacking-context-expected.txt (0 => 179147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/clipping/border-radius-overflow-hidden-stacking-context-expected.txt (rev 0)
+++ trunk/LayoutTests/compositing/clipping/border-radius-overflow-hidden-stacking-context-expected.txt 2015-01-26 22:59:40 UTC (rev 179147)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+Test CSS clip with composited layers. Left and right sides should look the same. This test should not ASSERT in debug builds.
+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 20.00 20.00)
+ (bounds 100.00 100.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 100.00 100.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 200.00 200.00)
+ (transform [1.00 0.00 0.00 0.00] [0.00 1.00 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 1.00 1.00])
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingclippingborderradiusoverflowhiddenstackingcontexthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/clipping/border-radius-overflow-hidden-stacking-context.html (0 => 179147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/clipping/border-radius-overflow-hidden-stacking-context.html (rev 0)
+++ trunk/LayoutTests/compositing/clipping/border-radius-overflow-hidden-stacking-context.html 2015-01-26 22:59:40 UTC (rev 179147)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<html>
+<head>
+ <style type="text/css" media="screen">
+ .box {
+ position: absolute;
+ width: 100px;
+ height: 100px;
+ top: 20px;
+ left: 20px;
+ background-color: gray;
+ border-radius: 30%;
+ overflow: hidden;
+ z-index: 0;
+ }
+
+ .inner {
+ width: 200px;
+ height: 200px;
+ background-color: rgba(0, 0, 0, 0.2);
+ }
+
+ .composited {
+ -webkit-transform: translateZ(1px);
+ }
+
+ p {
+ margin-top: 140px;
+ }
+ </style>
+ <script type="text/javascript" charset="utf-8">
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function doTest() {
+ if (window.testRunner) {
+ document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
+ testRunner.notifyDone();
+ }
+ }
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+ <div class="box">
+ <div class="composited inner">
+ </div>
+ </div>
+
+ <div class="box" style="left: 220px;">
+ <div class="inner">
+ </div>
+ </div>
+
+ <p>Test CSS clip with composited layers. Left and right sides should look the same. This test should not ASSERT in debug builds.</p>
+ <pre id="layers">In DRT, layer tree goes here.</pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (179146 => 179147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-01-26 22:50:15 UTC (rev 179146)
+++ trunk/Source/WebCore/ChangeLog 2015-01-26 22:59:40 UTC (rev 179147)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-01-26 Byungseon Shin <sun.shin@lge.com>
+
+ Fix Border-radius clipping issue on a composited descendants
+ https://bugs.webkit.org/show_bug.cgi?id=138551
+
+ Reviewed by Simon Fraser.
+
+ Fix assertion in RenderLayerBacking::paintIntoLayer
+ by not checking out of sync with the GraphicsLayer heirarchy
+ in GraphicsLayerPaintChildClippingMask phase.
+
+ Test: compositing/clipping/border-radius-overflow-hidden-stacking-context.html
+
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::paintIntoLayer):
+
</ins><span class="cx"> 2015-01-26 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Simplify RenderElement's shouldRepaintForImageAnimation()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (179146 => 179147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-26 22:50:15 UTC (rev 179146)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-01-26 22:59:40 UTC (rev 179147)
</span><span class="lines">@@ -2189,7 +2189,7 @@
</span><span class="cx"> const IntRect& paintDirtyRect, // In the coords of rootLayer.
</span><span class="cx"> PaintBehavior paintBehavior, GraphicsLayerPaintingPhase paintingPhase)
</span><span class="cx"> {
</span><del>- if (paintsIntoWindow() || paintsIntoCompositedAncestor()) {
</del><ins>+ if ((paintsIntoWindow() || paintsIntoCompositedAncestor()) && paintingPhase != GraphicsLayerPaintChildClippingMask) {
</ins><span class="cx"> #if !PLATFORM(IOS)
</span><span class="cx"> // FIXME: Looks like the CALayer tree is out of sync with the GraphicsLayer heirarchy
</span><span class="cx"> // when pages are restored from the PageCache.
</span></span></pre>
</div>
</div>
</body>
</html>