<!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>[213812] releases/WebKitGTK/webkit-2.16</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/213812">213812</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-13 03:40:05 -0700 (Mon, 13 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/213440">r213440</a> - Avoid backing store for layers with empty text nodes in a few more cases
https://bugs.webkit.org/show_bug.cgi?id=169185
Reviewed by Dan Bernstein.
Source/WebCore:
In hasPaintingNonLayerDescendants() we can check whether the RenderText's linesBoundingBox()
is empty to avoid backing store in a few more cases. Also use containsOnlyWhitespace() rather
than isAllCollapsibleWhitespace(), because there's no need for backing store for non-selectable
whitespace text.
Covered by existing tests.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
LayoutTests:
inline-block-no-backing.html enhanced to have a layer with non-collapsible whitespace (an &nbsp;).
Rebaselined other tests.
* compositing/backing/inline-block-no-backing-expected.txt:
* compositing/backing/inline-block-no-backing.html:
* compositing/iframes/page-cache-layer-tree-expected.txt:
* css3/blending/blend-mode-clip-accelerated-blending-canvas-expected.txt:
* platform/ios-simulator-wk2/compositing/backing/inline-block-no-backing-expected.txt:
* platform/ios-simulator-wk2/compositing/iframes/page-cache-layer-tree-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingbackinginlineblocknobackingexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/backing/inline-block-no-backing-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingbackinginlineblocknobackinghtml">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/backing/inline-block-no-backing.html</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscompositingiframespagecachelayertreeexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestscss3blendingblendmodeclipacceleratedblendingcanvasexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/css3/blending/blend-mode-clip-accelerated-blending-canvas-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsplatformiossimulatorwk2compositingbackinginlineblocknobackingexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/platform/ios-simulator-wk2/compositing/backing/inline-block-no-backing-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216LayoutTestsplatformiossimulatorwk2compositingiframespagecachelayertreeexpectedtxt">releases/WebKitGTK/webkit-2.16/LayoutTests/platform/ios-simulator-wk2/compositing/iframes/page-cache-layer-tree-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayercpp">releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit216LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2017-03-05 Simon Fraser <simon.fraser@apple.com>
+
+ Avoid backing store for layers with empty text nodes in a few more cases
+ https://bugs.webkit.org/show_bug.cgi?id=169185
+
+ Reviewed by Dan Bernstein.
+
+ inline-block-no-backing.html enhanced to have a layer with non-collapsible whitespace (an &nbsp;).
+
+ Rebaselined other tests.
+
+ * compositing/backing/inline-block-no-backing-expected.txt:
+ * compositing/backing/inline-block-no-backing.html:
+ * compositing/iframes/page-cache-layer-tree-expected.txt:
+ * css3/blending/blend-mode-clip-accelerated-blending-canvas-expected.txt:
+ * platform/ios-simulator-wk2/compositing/backing/inline-block-no-backing-expected.txt:
+ * platform/ios-simulator-wk2/compositing/iframes/page-cache-layer-tree-expected.txt:
+
</ins><span class="cx"> 2017-03-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Using <form> in <template> causes following <form> to get swallowed
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingbackinginlineblocknobackingexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/backing/inline-block-no-backing-expected.txt (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/backing/inline-block-no-backing-expected.txt 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/backing/inline-block-no-backing-expected.txt 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-
</del><ins>+
</ins><span class="cx">
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (bounds 800.00 600.00)
</span><span class="cx"> (contentsOpaque 1)
</span><del>- (children 3
</del><ins>+ (children 4
</ins><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 18.00 18.00)
</span><span class="cx"> (bounds 160.00 320.00)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> (drawsContent 1)
</span><span class="cx"> (children 2
</span><span class="cx"> (GraphicsLayer
</span><del>- (position 10.00 10.00)
</del><ins>+ (position 18.00 10.00)
</ins><span class="cx"> (bounds 120.00 120.00)
</span><span class="cx"> )
</span><span class="cx"> (GraphicsLayer
</span><span class="lines">@@ -51,6 +51,20 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ (GraphicsLayer
+ (position 570.00 18.00)
+ (bounds 160.00 320.00)
+ (children 2
+ (GraphicsLayer
+ (position 10.00 10.00)
+ (bounds 120.00 120.00)
+ )
+ (GraphicsLayer
+ (position 10.00 154.00)
+ (bounds 120.00 120.00)
+ )
+ )
+ )
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingbackinginlineblocknobackinghtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/backing/inline-block-no-backing.html (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/backing/inline-block-no-backing.html 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/backing/inline-block-no-backing.html 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -42,6 +42,10 @@
</span><span class="cx"> </script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><ins>+ <div class="composited container">&nbsp;
+ <img class="composited child" src="../resources/apple.jpg">
+ <img class="composited child" src="../resources/apple.jpg">
+ </div>
</ins><span class="cx"> <div class="composited container">
</span><span class="cx"> <img class="composited child" src="../resources/apple.jpg">
</span><span class="cx"> <img class="composited child" src="../resources/apple.jpg">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscompositingiframespagecachelayertreeexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/compositing/iframes/page-cache-layer-tree-expected.txt 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 274.00)
</span><span class="cx"> (bounds 784.00 224.00)
</span><del>- (drawsContent 1)
</del><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position -8.00 -8.00)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestscss3blendingblendmodeclipacceleratedblendingcanvasexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/css3/blending/blend-mode-clip-accelerated-blending-canvas-expected.txt (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/css3/blending/blend-mode-clip-accelerated-blending-canvas-expected.txt 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/css3/blending/blend-mode-clip-accelerated-blending-canvas-expected.txt 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -10,7 +10,6 @@
</span><span class="cx"> (position 8.00 8.00)
</span><span class="cx"> (bounds 100.00 100.00)
</span><span class="cx"> (contentsOpaque 1)
</span><del>- (drawsContent 1)
</del><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (bounds 100.00 100.00)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsplatformiossimulatorwk2compositingbackinginlineblocknobackingexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/platform/ios-simulator-wk2/compositing/backing/inline-block-no-backing-expected.txt (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/platform/ios-simulator-wk2/compositing/backing/inline-block-no-backing-expected.txt 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/platform/ios-simulator-wk2/compositing/backing/inline-block-no-backing-expected.txt 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-
</del><ins>+
</ins><span class="cx">
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (anchor 0.00 0.00)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (bounds 800.00 600.00)
</span><span class="cx"> (contentsOpaque 1)
</span><del>- (children 3
</del><ins>+ (children 4
</ins><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 18.00 18.00)
</span><span class="cx"> (bounds 160.00 320.00)
</span><span class="lines">@@ -14,7 +14,7 @@
</span><span class="cx"> (drawsContent 1)
</span><span class="cx"> (children 2
</span><span class="cx"> (GraphicsLayer
</span><del>- (position 10.00 10.00)
</del><ins>+ (position 18.00 10.00)
</ins><span class="cx"> (bounds 120.00 120.00)
</span><span class="cx"> (drawsContent 1)
</span><span class="cx"> )
</span><span class="lines">@@ -57,6 +57,22 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span><ins>+ (GraphicsLayer
+ (position 570.00 18.00)
+ (bounds 160.00 320.00)
+ (children 2
+ (GraphicsLayer
+ (position 10.00 10.00)
+ (bounds 120.00 120.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 10.00 155.00)
+ (bounds 120.00 120.00)
+ (drawsContent 1)
+ )
+ )
+ )
</ins><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx"> )
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216LayoutTestsplatformiossimulatorwk2compositingiframespagecachelayertreeexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/platform/ios-simulator-wk2/compositing/iframes/page-cache-layer-tree-expected.txt (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/LayoutTests/platform/ios-simulator-wk2/compositing/iframes/page-cache-layer-tree-expected.txt 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/platform/ios-simulator-wk2/compositing/iframes/page-cache-layer-tree-expected.txt 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -61,7 +61,6 @@
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position 8.00 277.00)
</span><span class="cx"> (bounds 784.00 225.00)
</span><del>- (drawsContent 1)
</del><span class="cx"> (children 1
</span><span class="cx"> (GraphicsLayer
</span><span class="cx"> (position -8.00 -8.00)
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-05 Simon Fraser <simon.fraser@apple.com>
+
+ Avoid backing store for layers with empty text nodes in a few more cases
+ https://bugs.webkit.org/show_bug.cgi?id=169185
+
+ Reviewed by Dan Bernstein.
+
+ In hasPaintingNonLayerDescendants() we can check whether the RenderText's linesBoundingBox()
+ is empty to avoid backing store in a few more cases. Also use containsOnlyWhitespace() rather
+ than isAllCollapsibleWhitespace(), because there's no need for backing store for non-selectable
+ whitespace text.
+
+ Covered by existing tests.
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+
</ins><span class="cx"> 2017-03-05 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Using <form> in <template> causes following <form> to get swallowed
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit216SourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayer.cpp (213811 => 213812)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayer.cpp 2017-03-13 10:38:43 UTC (rev 213811)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderLayer.cpp 2017-03-13 10:40:05 UTC (rev 213812)
</span><span class="lines">@@ -6587,11 +6587,17 @@
</span><span class="cx"> for (const auto& child : childrenOfType<RenderObject>(renderer)) {
</span><span class="cx"> if (++siblingCount > maxSiblingCount)
</span><span class="cx"> return true;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (is<RenderText>(child)) {
</span><del>- bool isSelectable = renderer.style().userSelect() != SELECT_NONE;
- if (isSelectable || !downcast<RenderText>(child).isAllCollapsibleWhitespace())
</del><ins>+ const auto& renderText = downcast<RenderText>(child);
+ if (renderText.linesBoundingBox().isEmpty())
+ continue;
+
+ if (renderer.style().userSelect() != SELECT_NONE)
</ins><span class="cx"> return true;
</span><ins>+
+ if (!renderText.text()->containsOnlyWhitespace())
+ return true;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!is<RenderElement>(child))
</span></span></pre>
</div>
</div>
</body>
</html>