<!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>[173295] 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/173295">173295</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2014-09-04 17:23:10 -0700 (Thu, 04 Sep 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>border-radius should not force layer backing store
https://bugs.webkit.org/show_bug.cgi?id=136555

Reviewed by Dean Jackson.

Source/WebCore:

Border-radius is not a reason to allocate backing store; it's not relevant unless
we also have a border or background, and hasBoxDecorations() already checks for that.

With that gone, we can now use renderer.hasBoxDecorations() (which also checks for
a background), but it doesn't check for outlines, so do that in addition.

Test: compositing/backing/border-radius-no-backing.html

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):

LayoutTests:

Test that dumps layers on some composited elements with border-radius

* compositing/backing/border-radius-no-backing-expected.txt: Added.
* compositing/backing/border-radius-no-backing.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="#trunkLayoutTestscompositingbackingborderradiusnobackingexpectedtxt">trunk/LayoutTests/compositing/backing/border-radius-no-backing-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingbackingborderradiusnobackinghtml">trunk/LayoutTests/compositing/backing/border-radius-no-backing.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (173294 => 173295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2014-09-05 00:23:08 UTC (rev 173294)
+++ trunk/LayoutTests/ChangeLog        2014-09-05 00:23:10 UTC (rev 173295)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2014-09-04  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        border-radius should not force layer backing store
+        https://bugs.webkit.org/show_bug.cgi?id=136555
+
+        Reviewed by Dean Jackson.
+        
+        Test that dumps layers on some composited elements with border-radius
+
+        * compositing/backing/border-radius-no-backing-expected.txt: Added.
+        * compositing/backing/border-radius-no-backing.html: Added.
+
+2014-09-04  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
</ins><span class="cx">         CSS filter on a compositing layer should not cause unncessary backing store allocation
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=136557
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestscompositingbackingborderradiusnobackingexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/backing/border-radius-no-backing-expected.txt (0 => 173295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/backing/border-radius-no-backing-expected.txt                                (rev 0)
+++ trunk/LayoutTests/compositing/backing/border-radius-no-backing-expected.txt        2014-09-05 00:23:10 UTC (rev 173295)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 800.00 600.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 800.00 600.00)
+      (contentsOpaque 1)
+      (children 2
+        (GraphicsLayer
+          (position 8.00 8.00)
+          (bounds 784.00 124.00)
+          (drawsContent 1)
+          (children 1
+            (GraphicsLayer
+              (position 12.00 12.00)
+              (bounds 100.00 100.00)
+              (contentsOpaque 1)
+            )
+          )
+        )
+        (GraphicsLayer
+          (position 8.00 132.00)
+          (bounds 100.00 100.00)
+          (drawsContent 1)
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingbackingborderradiusnobackinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/backing/border-radius-no-backing.html (0 => 173295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/backing/border-radius-no-backing.html                                (rev 0)
+++ trunk/LayoutTests/compositing/backing/border-radius-no-backing.html        2014-09-05 00:23:10 UTC (rev 173295)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        .container {
+            padding: 10px;
+            border: 2px solid black;
+        }
+        .box {
+            height: 100px;
+            width: 100px;
+            background-color: blue;
+        }
+        
+        .composited {
+            -webkit-transform: translateZ(0);
+        }
+        
+        .rounded {
+            border-radius: 50%;
+        }
+    &lt;/style&gt;
+    &lt;script&gt;
+        if (window.testRunner)
+            testRunner.dumpAsText();
+
+        function dumpLayers()
+        {
+            var layersResult = document.getElementById('layers');
+            if (window.testRunner)
+                layersResult.innerText = window.internals.layerTreeAsText(document);
+        }
+
+        window.addEventListener('load', dumpLayers, false)
+    &lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+    &lt;div class=&quot;composited rounded container&quot;&gt;
+        &lt;div class=&quot;composited box&quot;&gt;
+        &lt;/div&gt;
+    &lt;/div&gt;
+
+&lt;div class=&quot;composited rounded box&quot;&gt;
+&lt;/div&gt;
+
+&lt;pre id=&quot;layers&quot;&gt;Layer tree goes here in DRT&lt;/pre&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (173294 => 173295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-09-05 00:23:08 UTC (rev 173294)
+++ trunk/Source/WebCore/ChangeLog        2014-09-05 00:23:10 UTC (rev 173295)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-09-04  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        border-radius should not force layer backing store
+        https://bugs.webkit.org/show_bug.cgi?id=136555
+
+        Reviewed by Dean Jackson.
+        
+        Border-radius is not a reason to allocate backing store; it's not relevant unless
+        we also have a border or background, and hasBoxDecorations() already checks for that.
+        
+        With that gone, we can now use renderer.hasBoxDecorations() (which also checks for
+        a background), but it doesn't check for outlines, so do that in addition.
+
+        Test: compositing/backing/border-radius-no-backing.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+
+2014-09-04  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
</ins><span class="cx">         CSS filter on a compositing layer should not cause unncessary backing store allocation
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=136557
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (173294 => 173295)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-09-05 00:23:08 UTC (rev 173294)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2014-09-05 00:23:10 UTC (rev 173295)
</span><span class="lines">@@ -6246,15 +6246,9 @@
</span><span class="cx">         parent()-&gt;dirtyAncestorChainHasSelfPaintingLayerDescendantStatus();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-// FIXME: use RenderObject::hasBoxDecorations(). And why hasBorderRadius()?
-static bool hasBoxDecorations(const RenderStyle&amp; style)
-{
-    return style.hasBorder() || style.hasBorderRadius() || style.hasOutline() || style.hasAppearance() || style.boxShadow();
-}
-
</del><span class="cx"> static bool hasBoxDecorationsOrBackground(const RenderElement&amp; renderer)
</span><span class="cx"> {
</span><del>-    return hasBoxDecorations(renderer.style()) || renderer.hasBackground();
</del><ins>+    return renderer.hasBoxDecorations() || renderer.style().hasOutline();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> // Constrain the depth and breadth of the search for performance.
</span></span></pre>
</div>
</div>

</body>
</html>