<!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>[207078] 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/207078">207078</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-11 03:31:36 -0700 (Tue, 11 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/205999">r205999</a> - ASSERTION FAILED: willBeComposited == needsToBeComposited(layer) in WebCore::RenderLayerCompositor::computeCompositingRequirements
https://bugs.webkit.org/show_bug.cgi?id=151097
<rdar://problem/27711678>
Reviewed by Simon Fraser.
Source/WebCore:
This patch ensures that when will-change property triggers stacking context, we make the associated layer a non-normal flow layer.
(This is similar to what any other stacking context-triggering CSS property does.)
Test: compositing/assert-on-will-change-transform-with-composited-descendant.html
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::calculateClipRects):
LayoutTests:
* compositing/assert-on-will-change-transform-with-composited-descendant-expected.txt: Added.
* compositing/assert-on-will-change-transform-with-composited-descendant.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="#releasesWebKitGTKwebkit214LayoutTestscompositingassertonwillchangetransformwithcompositeddescendantexpectedtxt">releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/assert-on-will-change-transform-with-composited-descendant-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit214LayoutTestscompositingassertonwillchangetransformwithcompositeddescendanthtml">releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/assert-on-will-change-transform-with-composited-descendant.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 (207077 => 207078)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-11 10:24:07 UTC (rev 207077)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/ChangeLog 2016-10-11 10:31:36 UTC (rev 207078)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2016-09-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ ASSERTION FAILED: willBeComposited == needsToBeComposited(layer) in WebCore::RenderLayerCompositor::computeCompositingRequirements
+ https://bugs.webkit.org/show_bug.cgi?id=151097
+ <rdar://problem/27711678>
+
+ Reviewed by Simon Fraser.
+
+ * compositing/assert-on-will-change-transform-with-composited-descendant-expected.txt: Added.
+ * compositing/assert-on-will-change-transform-with-composited-descendant.html: Added.
+
+2016-09-15 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Cleanup RenderLayer::shouldBeNormalFlowOnly
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161981
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestscompositingassertonwillchangetransformwithcompositeddescendantexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/assert-on-will-change-transform-with-composited-descendant-expected.txt (0 => 207078)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/assert-on-will-change-transform-with-composited-descendant-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/assert-on-will-change-transform-with-composited-descendant-expected.txt 2016-10-11 10:31:36 UTC (rev 207078)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+PASS if no assert in debug.
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214LayoutTestscompositingassertonwillchangetransformwithcompositeddescendanthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/assert-on-will-change-transform-with-composited-descendant.html (0 => 207078)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/assert-on-will-change-transform-with-composited-descendant.html (rev 0)
+++ releases/WebKitGTK/webkit-2.14/LayoutTests/compositing/assert-on-will-change-transform-with-composited-descendant.html 2016-10-11 10:31:36 UTC (rev 207078)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title></title>
+<script>
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<style>
+.container {
+ overflow: hidden;
+ will-change: -webkit-transform;
+}
+
+.inner {
+ z-index: -1;
+ position: relative;
+ transform: translateZ(0);
+}
+</style>
+</head>
+<body>
+PASS if no assert in debug.
+<div class=container><div class=inner></div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog (207077 => 207078)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 10:24:07 UTC (rev 207077)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/ChangeLog 2016-10-11 10:31:36 UTC (rev 207078)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-09-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ ASSERTION FAILED: willBeComposited == needsToBeComposited(layer) in WebCore::RenderLayerCompositor::computeCompositingRequirements
+ https://bugs.webkit.org/show_bug.cgi?id=151097
+ <rdar://problem/27711678>
+
+ Reviewed by Simon Fraser.
+
+ This patch ensures that when will-change property triggers stacking context, we make the associated layer a non-normal flow layer.
+ (This is similar to what any other stacking context-triggering CSS property does.)
+
+ Test: compositing/assert-on-will-change-transform-with-composited-descendant.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::calculateClipRects):
+
+2016-09-15 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> Cleanup RenderLayer::shouldBeNormalFlowOnly
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161981
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit214SourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp (207077 => 207078)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp 2016-10-11 10:24:07 UTC (rev 207077)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/RenderLayer.cpp 2016-10-11 10:31:36 UTC (rev 207078)
</span><span class="lines">@@ -6464,33 +6464,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool mayCreateGraphicalGroup(const RenderElement& renderer)
</del><ins>+static bool createsStackingContext(const RenderLayer& layer)
</ins><span class="cx"> {
</span><del>- bool createsGraphicalGroup = renderer.hasClipPath()
</del><ins>+ auto& renderer = layer.renderer();
+ return renderer.hasTransformRelatedProperty()
+ || renderer.hasClipPath()
</ins><span class="cx"> || renderer.hasFilter()
</span><ins>+ || renderer.hasMask()
</ins><span class="cx"> || renderer.hasBackdropFilter()
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> || renderer.hasBlendMode()
</span><span class="cx"> #endif
</span><span class="cx"> || renderer.isTransparent()
</span><del>- || renderer.hasMask();
- return createsGraphicalGroup || (renderer.style().willChange() && renderer.style().willChange()->canCreateGraphicalGroup());
-}
-
-static bool createsStackingContext(const RenderLayer& layer)
-{
- auto& renderer = layer.renderer();
- return renderer.hasTransformRelatedProperty()
</del><span class="cx"> || renderer.isPositioned()
</span><del>- || layer.needsCompositedScrolling()
</del><span class="cx"> || renderer.style().hasFlowFrom()
</span><span class="cx"> || renderer.hasReflection()
</span><span class="cx"> || renderer.style().hasIsolation()
</span><ins>+ || layer.needsCompositedScrolling()
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> || layer.hasAcceleratedTouchScrolling()
</span><span class="cx"> #endif
</span><del>- // FIXME: Check if willChange()->canCreateStackingContext() is more accurate here.
- || mayCreateGraphicalGroup(renderer);
</del><ins>+ || (renderer.style().willChange() && renderer.style().willChange()->canCreateStackingContext());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool RenderLayer::shouldBeNormalFlowOnly() 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 (207077 => 207078)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.cpp 2016-10-11 10:24:07 UTC (rev 207077)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.cpp 2016-10-11 10:31:36 UTC (rev 207078)
</span><span class="lines">@@ -99,30 +99,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
- }
-}
-
</del><span class="cx"> static bool propertyTriggersCompositing(CSSPropertyID property)
</span><span class="cx"> {
</span><span class="cx"> switch (property) {
</span><span class="lines">@@ -161,8 +137,6 @@
</span><span class="cx">
</span><span class="cx"> m_canTriggerCompositingOnInline |= propertyTriggersCompositing(propertyID);
</span><span class="cx"> m_canTriggerCompositing |= m_canTriggerCompositingOnInline | propertyTriggersCompositingOnBoxesOnly(propertyID);
</span><del>-
- m_canCreateGraphicalGroup |= propertyCreatesGraphicalGroup(propertyID);
</del><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 (207077 => 207078)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.h 2016-10-11 10:24:07 UTC (rev 207077)
+++ releases/WebKitGTK/webkit-2.14/Source/WebCore/rendering/style/WillChangeData.h 2016-10-11 10:31:36 UTC (rev 207078)
</span><span class="lines">@@ -57,7 +57,6 @@
</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><del>- bool canCreateGraphicalGroup() const { return m_canCreateGraphicalGroup; }
</del><span class="cx">
</span><span class="cx"> enum Feature {
</span><span class="cx"> ScrollPosition,
</span><span class="lines">@@ -125,7 +124,6 @@
</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><del>- bool m_canCreateGraphicalGroup { false };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>