<!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>[193520] branches/safari-601-branch</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/193520">193520</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 10:30:21 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188604">r188604</a>. rdar://problem/23769584</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchLayoutTestsfastcsswillchangeresourceswillchangestackinghelperjs">branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderElementcpp">branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderElementh">branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderInlineh">branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleWillChangeDatacpp">branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193519 => 193520)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog        2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/LayoutTests/ChangeLog        2015-12-05 18:30:21 UTC (rev 193520)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188604. rdar://problem/23769584
+
+ 2015-08-18 Simon Fraser <simon.fraser@apple.com>
+
+ will-change: backface-visibility should not cause stacking context
+ https://bugs.webkit.org/show_bug.cgi?id=148091
+
+ Reviewed by Zalan Bujtas.
+
+ Test that will-change: -webkit-backface-visibility does not create
+ stacking context.
+
+ * fast/css/will-change/resources/will-change-stacking-helper.js:
+
+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r189890. rdar://problem/23769735
</span><span class="cx">
</span><span class="cx"> 2015-09-16 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsfastcsswillchangeresourceswillchangestackinghelperjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js (193519 => 193520)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js        2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js        2015-12-05 18:30:21 UTC (rev 193520)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> { 'property' : 'auto', 'stacking' : false },
</span><span class="cx"> { 'property' : 'background', 'stacking' : false },
</span><span class="cx"> { 'property' : 'will-change', 'stacking' : false },
</span><ins>+ { 'property' : '-webkit-backface-visibility', 'stacking' : false },
</ins><span class="cx">
</span><span class="cx"> { 'property' : 'clip-path', 'stacking' : true },
</span><span class="cx"> { 'property' : 'mask', 'stacking' : true },
</span><span class="lines">@@ -16,7 +17,6 @@
</span><span class="cx">
</span><span class="cx"> { 'property' : '-webkit-filter', 'stacking' : true },
</span><span class="cx"> { 'property' : '-webkit-clip-path', 'stacking' : true },
</span><del>- { 'property' : '-webkit-backface-visibility', 'stacking' : true },
</del><span class="cx"> { 'property' : '-webkit-box-reflect', 'stacking' : true },
</span><span class="cx"> { 'property' : '-webkit-backdrop-filter', 'stacking' : true },
</span><span class="cx"> { 'property' : '-webkit-mask', 'stacking' : true },
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193519 => 193520)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog        2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog        2015-12-05 18:30:21 UTC (rev 193520)
</span><span class="lines">@@ -1,5 +1,32 @@
</span><span class="cx"> 2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r188604. rdar://problem/23769584
+
+ 2015-08-18 Simon Fraser <simon.fraser@apple.com>
+
+ will-change: backface-visibility should not cause stacking context
+ https://bugs.webkit.org/show_bug.cgi?id=148091
+
+ Reviewed by Zalan Bujtas.
+
+ Take CSSPropertyWebkitBackfaceVisibility out of the list of properties that causes
+ will-change to create stacking context, since no value of the property creates
+ stacking.
+
+ Move willChangeCreatesStackingContext() and shouldWillChangeCreateStackingContext()
+ into RenderInline since it's only called from there.
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::shouldWillChangeCreateStackingContext): Deleted.
+ * rendering/RenderElement.h:
+ (WebCore::RenderElement::willChangeCreatesStackingContext): Deleted.
+ * rendering/RenderInline.h:
+ (WebCore::RenderInline::willChangeCreatesStackingContext):
+ * rendering/style/WillChangeData.cpp:
+ (WebCore::propertyCreatesStackingContext): Deleted.
+
+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188168. rdar://problem/23769732
</span><span class="cx">
</span><span class="cx"> 2015-08-07 Myles C. Maxfield <mmaxfield@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp (193519 => 193520)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp        2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp        2015-12-05 18:30:21 UTC (rev 193520)
</span><span class="lines">@@ -1446,16 +1446,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool RenderElement::shouldWillChangeCreateStackingContext() const
-{
- ASSERT(style().willChange());
- ASSERT(style().willChange()->canCreateStackingContext());
-
- // On inlines, we only want to trigger RenderLayer creation
- // if will-change contains a property that applies to inlines.
- return is<RenderBox>(this) || (is<RenderInline>(this) && style().willChange()->canCreateStackingContextOnInline());
-}
-
</del><span class="cx"> RenderNamedFlowThread* RenderElement::renderNamedFlowThreadWrapper()
</span><span class="cx"> {
</span><span class="cx"> auto* renderer = this;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderElementh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h (193519 => 193520)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h        2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h        2015-12-05 18:30:21 UTC (rev 193520)
</span><span class="lines">@@ -164,10 +164,6 @@
</span><span class="cx"> bool hasClipOrOverflowClip() const { return hasClip() || hasOverflowClip(); }
</span><span class="cx"> bool hasClipPath() const { return style().clipPath(); }
</span><span class="cx"> bool hasHiddenBackface() const { return style().backfaceVisibility() == BackfaceVisibilityHidden; }
</span><del>- bool willChangeCreatesStackingContext() const
- {
- return style().willChange() && style().willChange()->canCreateStackingContext() && shouldWillChangeCreateStackingContext();
- }
</del><span class="cx">
</span><span class="cx"> // anchorRect() is conceptually similar to absoluteBoundingBoxRect(), but is intended for scrolling to an anchor.
</span><span class="cx"> // For inline renderers, this gets the logical top left of the first leaf child and the logical bottom right of the
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderInlineh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h (193519 => 193520)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h        2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h        2015-12-05 18:30:21 UTC (rev 193520)
</span><span class="lines">@@ -177,6 +177,11 @@
</span><span class="cx"> const LayoutRect& nextLine, const Color);
</span><span class="cx"> RenderBoxModelObject* continuationBefore(RenderObject* beforeChild);
</span><span class="cx">
</span><ins>+ bool willChangeCreatesStackingContext() const
+ {
+ return style().willChange() && style().willChange()->canCreateStackingContextOnInline();
+ }
+
</ins><span class="cx"> RenderLineBoxList m_lineBoxes; // All of the line boxes created for this inline flow. For example, <i>Hello<br>world.</i> will have two <i> line boxes.
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleWillChangeDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp (193519 => 193520)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp        2015-12-05 18:30:17 UTC (rev 193519)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp        2015-12-05 18:30:21 UTC (rev 193520)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> case CSSPropertyOpacity:
</span><span class="cx"> case CSSPropertyPosition:
</span><span class="cx"> case CSSPropertyZIndex:
</span><del>- case CSSPropertyWebkitBackfaceVisibility:
</del><span class="cx"> case CSSPropertyWebkitBoxReflect:
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> case CSSPropertyMixBlendMode:
</span></span></pre>
</div>
</div>
</body>
</html>