<!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>[205612] releases/WebKitGTK/webkit-2.14</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/205612">205612</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-09-08 02:16:52 -0700 (Thu, 08 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205277">r205277</a> - ASSERTION FAILED: !flow->layer() && !flow->isInlineElementContinuation() in WebCore::RenderBlock::addContinuationWithOutline
https://bugs.webkit.org/show_bug.cgi?id=151022
<rdar://problem/27710993>
Reviewed by Simon Fraser.
Source/WebCore:
Certain CSS properties like opacity, mask etc (graphical group members) require the layer to be a non-normal flow,
self painting layer so that we can manage painting properly. However in addition to those CSS properties, some of the will-change
values (again, graphical group members) also require the layer to be non-normal flow, self painting.
This patch ensures that when deciding whether a layer should be a normal flow layer, we take the will-change values into account as well.
Tests: compositing/layer-creation/assert-on-inline-element-with-will-change.html
compositing/layer-creation/will-change-on-normal-flow-content.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
* rendering/style/WillChangeData.cpp:
(WebCore::propertyCreatesGraphicalGroup):
(WebCore::WillChangeData::addFeature):
* rendering/style/WillChangeData.h:
(WebCore::WillChangeData::canCreateGraphicalGroup):
(WebCore::WillChangeData::canTriggerCompositingOnInline): Deleted.
LayoutTests:
* compositing/layer-creation/assert-on-inline-element-with-will-change-expected.txt: Added.
* compositing/layer-creation/assert-on-inline-element-with-will-change.html: Added.
* compositing/layer-creation/will-change-on-normal-flow-content-expected.txt: Added.
* compositing/layer-creation/will-change-on-normal-flow-content.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayercpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingstyleWillChangeDatacpp">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit214SourceWebCorerenderingstyleWillChangeDatah">releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestscompositinglayercreationassertoninlineelementwithwillchangeexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/assert-on-inline-element-with-will-change-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestscompositinglayercreationassertoninlineelementwithwillchangehtml">releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/assert-on-inline-element-with-will-change.html</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestscompositinglayercreationwillchangeonnormalflowcontentexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/will-change-on-normal-flow-content-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestscompositinglayercreationwillchangeonnormalflowcontenthtml">releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/will-change-on-normal-flow-content.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit214LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog (205611 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-09-08 09:09:59 UTC (rev 205611)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-08-31 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !flow->layer() && !flow->isInlineElementContinuation() in WebCore::RenderBlock::addContinuationWithOutline
+ https://bugs.webkit.org/show_bug.cgi?id=151022
+ <rdar://problem/27710993>
+
+ Reviewed by Simon Fraser.
+
+ * compositing/layer-creation/assert-on-inline-element-with-will-change-expected.txt: Added.
+ * compositing/layer-creation/assert-on-inline-element-with-will-change.html: Added.
+ * compositing/layer-creation/will-change-on-normal-flow-content-expected.txt: Added.
+ * compositing/layer-creation/will-change-on-normal-flow-content.html: Added.
+
</ins><span class="cx"> 2016-08-31 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: XHR with text but responseType = "blob" shows blank content
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestscompositinglayercreationassertoninlineelementwithwillchangeexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/assert-on-inline-element-with-will-change-expected.txt (0 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/assert-on-inline-element-with-will-change-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/assert-on-inline-element-with-will-change-expected.txt 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no assert in debug.
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestscompositinglayercreationassertoninlineelementwithwillchangehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/assert-on-inline-element-with-will-change.html (0 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/assert-on-inline-element-with-will-change.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/assert-on-inline-element-with-will-change.html 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we make a self painting layer for the inline when will-change requires one.</title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+span {
+ outline: 5px solid green;
+ -webkit-columns: 100px 1;
+ will-change: opacity;
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.
+<span><div></div></span>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestscompositinglayercreationwillchangeonnormalflowcontentexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/will-change-on-normal-flow-content-expected.txt (0 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/will-change-on-normal-flow-content-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/will-change-on-normal-flow-content-expected.txt 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+opacity
+mask
+backdrop-filter
+filter
+clip-path
+(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 18.00)
+(drawsContent 1)
+)
+(GraphicsLayer
+(position 8.00 62.00)
+(bounds 784.00 18.00)
+(drawsContent 1)
+)
+)
+)
+)
+)
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestscompositinglayercreationwillchangeonnormalflowcontenthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/will-change-on-normal-flow-content.html (0 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/will-change-on-normal-flow-content.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/layer-creation/will-change-on-normal-flow-content.html 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we make a self painting layer for the inline when will-change requires one.</title>
+<script>
+function doTest() {
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ document.getElementById('layers').innerText = window.internals.layerTreeAsText(document, internals.LAYER_TREE_INCLUDES_CONTENT_LAYERS);
+ }
+}
+window.addEventListener('load', doTest, false)
+</script>
+<style>
+div {
+ -webkit-columns: 100px 1;
+}
+</style>
+</head>
+<body>
+<div style="will-change: opacity">opacity</div>
+<div style="will-change: mask">mask</div>
+<div style="will-change: backdrop-filter">backdrop-filter</div>
+<div style="will-change: filter">filter</div>
+<div style="will-change: clip-path">clip-path</div>
+<div id=layers></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (205611 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 09:09:59 UTC (rev 205611)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-08-31 Zalan Bujtas <zalan@apple.com>
+
+ ASSERTION FAILED: !flow->layer() && !flow->isInlineElementContinuation() in WebCore::RenderBlock::addContinuationWithOutline
+ https://bugs.webkit.org/show_bug.cgi?id=151022
+ <rdar://problem/27710993>
+
+ Reviewed by Simon Fraser.
+
+ Certain CSS properties like opacity, mask etc (graphical group members) require the layer to be a non-normal flow,
+ self painting layer so that we can manage painting properly. However in addition to those CSS properties, some of the will-change
+ values (again, graphical group members) also require the layer to be non-normal flow, self painting.
+ This patch ensures that when deciding whether a layer should be a normal flow layer, we take the will-change values into account as well.
+
+ Tests: compositing/layer-creation/assert-on-inline-element-with-will-change.html
+ compositing/layer-creation/will-change-on-normal-flow-content.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+ * rendering/style/WillChangeData.cpp:
+ (WebCore::propertyCreatesGraphicalGroup):
+ (WebCore::WillChangeData::addFeature):
+ * rendering/style/WillChangeData.h:
+ (WebCore::WillChangeData::canCreateGraphicalGroup):
+ (WebCore::WillChangeData::canTriggerCompositingOnInline): Deleted.
+
</ins><span class="cx"> 2016-08-31 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: XHR with text but responseType = "blob" shows blank content
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp (205611 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp 2016-09-08 09:09:59 UTC (rev 205611)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -6464,6 +6464,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool mayCreateGraphicalGroup(const RenderElement& renderer)
+{
+ bool createsGraphicalGroup = renderer.hasClipPath()
+ || renderer.hasFilter()
+ || renderer.hasBackdropFilter()
+#if ENABLE(CSS_COMPOSITING)
+ || renderer.hasBlendMode()
+#endif
+ || renderer.isTransparent()
+ || renderer.hasMask();
+ return createsGraphicalGroup || (renderer.style().willChange() && renderer.style().willChange()->canCreateGraphicalGroup());
+}
+
</ins><span class="cx"> bool RenderLayer::shouldBeNormalFlowOnly() const
</span><span class="cx"> {
</span><span class="cx"> return (renderer().hasOverflowClip()
</span><span class="lines">@@ -6475,20 +6488,14 @@
</span><span class="cx"> || renderer().isRenderIFrame()
</span><span class="cx"> || (renderer().style().specifiesColumns() && !isRootLayer())
</span><span class="cx"> || renderer().isInFlowRenderFlowThread())
</span><ins>+ && !renderer().hasTransformRelatedProperty()
</ins><span class="cx"> && !renderer().isPositioned()
</span><del>- && !renderer().hasTransformRelatedProperty()
- && !renderer().hasClipPath()
- && !renderer().hasFilter()
- && !renderer().hasBackdropFilter()
</del><ins>+ && !needsCompositedScrolling()
+ && !renderer().style().hasFlowFrom()
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> && !hasAcceleratedTouchScrolling()
</span><span class="cx"> #endif
</span><del>-#if ENABLE(CSS_COMPOSITING)
- && !renderer().hasBlendMode()
-#endif
- && !isTransparent()
- && !needsCompositedScrolling()
- && !renderer().style().hasFlowFrom();
</del><ins>+ && !mayCreateGraphicalGroup(renderer());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::shouldBeSelfPaintingLayer() const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingstyleWillChangeDatacpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.cpp (205611 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.cpp 2016-09-08 09:09:59 UTC (rev 205611)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.cpp 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -99,6 +99,30 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool propertyCreatesGraphicalGroup(CSSPropertyID property)
+{
+ switch (property) {
+ case CSSPropertyClipPath:
+ case CSSPropertyWebkitClipPath:
+ case CSSPropertyMask:
+ case CSSPropertyOpacity:
+#if ENABLE(CSS_COMPOSITING)
+ case CSSPropertyMixBlendMode:
+ case CSSPropertyIsolation:
+#endif
+ case CSSPropertyFilter:
+#if ENABLE(FILTERS_LEVEL_2)
+ case CSSPropertyWebkitBackdropFilter:
+#endif
+ case CSSPropertyWebkitMask:
+ case CSSPropertyWebkitMaskImage:
+ case CSSPropertyWebkitMaskBoxImage:
+ return true;
+ default:
+ return false;
+ }
+}
+
</ins><span class="cx"> static bool propertyTriggersCompositing(CSSPropertyID property)
</span><span class="cx"> {
</span><span class="cx"> switch (property) {
</span><span class="lines">@@ -137,6 +161,8 @@
</span><span class="cx">
</span><span class="cx"> m_canTriggerCompositingOnInline |= propertyTriggersCompositing(propertyID);
</span><span class="cx"> m_canTriggerCompositing |= m_canTriggerCompositingOnInline | propertyTriggersCompositingOnBoxesOnly(propertyID);
</span><ins>+
+ m_canCreateGraphicalGroup |= propertyCreatesGraphicalGroup(propertyID);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WillChangeData::FeaturePropertyPair WillChangeData::featureAt(size_t index) const
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingstyleWillChangeDatah"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.h (205611 => 205612)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.h 2016-09-08 09:09:59 UTC (rev 205611)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.h 2016-09-08 09:16:52 UTC (rev 205612)
</span><span class="lines">@@ -57,6 +57,7 @@
</span><span class="cx"> bool canCreateStackingContext() const { return m_canCreateStackingContext; }
</span><span class="cx"> bool canTriggerCompositing() const { return m_canTriggerCompositing; }
</span><span class="cx"> bool canTriggerCompositingOnInline() const { return m_canTriggerCompositingOnInline; }
</span><ins>+ bool canCreateGraphicalGroup() const { return m_canCreateGraphicalGroup; }
</ins><span class="cx">
</span><span class="cx"> enum Feature {
</span><span class="cx"> ScrollPosition,
</span><span class="lines">@@ -124,6 +125,7 @@
</span><span class="cx"> bool m_canCreateStackingContext { false };
</span><span class="cx"> bool m_canTriggerCompositing { false };
</span><span class="cx"> bool m_canTriggerCompositingOnInline { false };
</span><ins>+ bool m_canCreateGraphicalGroup { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>