<!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>[193546] branches/safari-601.1.46-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/193546">193546</a></dd>
<dt>Author</dt> <dd>ddkilzer@apple.com</dd>
<dt>Date</dt> <dd>2015-12-05 18:57:16 -0800 (Sat, 05 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/190667">r190667</a>. rdar://problem/23769564</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsChangeLog">branches/safari-601.1.46-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcsswillchangeresourceswillchangestackinghelperjs">branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontextexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontexthtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsplatformmacTestExpectations">branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#branchessafari601146branchSourceWebCoreChangeLog">branches/safari-601.1.46-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderInlinecpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderInline.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingRenderInlineh">branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderInline.h</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleWillChangeDatacpp">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.cpp</a></li>
<li><a href="#branchessafari601146branchSourceWebCorerenderingstyleWillChangeDatah">branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontextinlineexpectedhtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline-expected.html</a></li>
<li><a href="#branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontextinlinehtml">branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601146branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/ChangeLog (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/LayoutTests/ChangeLog 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -1,5 +1,29 @@
</span><span class="cx"> 2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190667. rdar://problem/23769564
+
+ 2015-10-06 Simon Fraser <simon.fraser@apple.com>
+
+ will-change should trigger stacking context based purely on properties
+ https://bugs.webkit.org/show_bug.cgi?id=148068
+
+ Reviewed by Zalan Bujtas.
+
+ Previously, our will-change implementation didn't trigger stacking context
+ on an inline if the will-change property didn't apply to inlines (like 'transform').
+ However, this doesn't agree with the CSS-WG consensus (https://lists.w3.org/Archives/Public/www-style/2015Sep/0112.html).
+
+ Change behavior to have stacking context creation behavior for will-change be
+ identical for inlines and blocks.
+
+ * platform/mac/TestExpectations: Fails on Mavericks because no backdrop-filter there.
+ * fast/css/will-change/resources/will-change-stacking-helper.js:
+ (makeStackingInline):
+ * fast/css/will-change/will-change-creates-stacking-context-inline-expected.html: Added.
+ * fast/css/will-change/will-change-creates-stacking-context-inline.html: Added.
+
+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188604. rdar://problem/23769564
</span><span class="cx">
</span><span class="cx"> 2015-08-18 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcsswillchangeresourceswillchangestackinghelperjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/resources/will-change-stacking-helper.js 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -27,7 +27,7 @@
</span><span class="cx"> { 'property' : '-webkit-flow-from', 'stacking' : true },
</span><span class="cx"> ];
</span><span class="cx">
</span><del>-function makeStackingBlock(stackingProperty, value)
</del><ins>+function makeStackingElement(stackingProperty, value)
</ins><span class="cx"> {
</span><span class="cx"> var container = document.createElement('div');
</span><span class="cx"> container.className = 'container';
</span><span class="lines">@@ -48,4 +48,3 @@
</span><span class="cx">
</span><span class="cx"> document.body.appendChild(container);
</span><span class="cx"> }
</span><del>-
</del></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontextexpectedhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> function doTest()
</span><span class="cx"> {
</span><span class="cx"> for (value of willChangeValues) {
</span><del>- makeStackingBlock('z-index', value.stacking ? '0' : 'auto');
</del><ins>+ makeStackingElement('z-index', value.stacking ? '0' : 'auto');
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontextinlineexpectedhtmlfromrev193545branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontextexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline-expected.html (from rev 193545, branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html) (0 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline-expected.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline-expected.html 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .container {
+ display: inline-block;
+ margin: 25px;
+ width: 50px;
+ height: 50px;
+ position: relative;
+ border: 1px solid black;
+ }
+
+ .container div {
+ width: 100%;
+ height: 100%;
+ }
+
+ .potential-stacking-context {
+ z-index: auto;
+ background-color: silver;
+ display: inline;
+ padding: 20px;
+ }
+
+ .child {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ z-index: 1;
+ background-color: orange;
+ }
+
+ .interposer {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ z-index: 0;
+ background-color: green;
+ }
+ </style>
+
+ <script src="resources/will-change-stacking-helper.js"></script>
+ <script>
+ function doTest()
+ {
+ for (value of willChangeValues) {
+ makeStackingElement('opacity', value.stacking ? '0.999999' : '1');
+ }
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontextinlinehtmlfromrev193545branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontextexpectedhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline.html (from rev 193545, branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-expected.html) (0 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline.html (rev 0)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context-inline.html 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .container {
+ display: inline-block;
+ margin: 25px;
+ width: 50px;
+ height: 50px;
+ position: relative;
+ border: 1px solid black;
+ }
+
+ .container div {
+ width: 100%;
+ height: 100%;
+ }
+
+ .potential-stacking-context {
+ z-index: auto;
+ background-color: silver;
+ display: inline;
+ padding: 20px;
+ }
+
+ .child {
+ position: absolute;
+ top: 10px;
+ left: 10px;
+ z-index: 1;
+ background-color: orange;
+ }
+
+ .interposer {
+ position: absolute;
+ top: 20px;
+ left: 20px;
+ z-index: 0;
+ background-color: green;
+ }
+ </style>
+
+ <script src="resources/will-change-stacking-helper.js"></script>
+ <script>
+ function doTest()
+ {
+ for (value of willChangeValues) {
+ makeStackingElement('will-change', value.property);
+ }
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601146branchLayoutTestsfastcsswillchangewillchangecreatesstackingcontexthtml"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context.html (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context.html 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/LayoutTests/fast/css/will-change/will-change-creates-stacking-context.html 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> function doTest()
</span><span class="cx"> {
</span><span class="cx"> for (value of willChangeValues) {
</span><del>- makeStackingBlock('will-change', value.property);
</del><ins>+ makeStackingElement('will-change', value.property);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari601146branchLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/LayoutTests/platform/mac/TestExpectations 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -1321,6 +1321,9 @@
</span><span class="cx"> accessibility/color-well.html [ Skip ]
</span><span class="cx"> fast/forms/color [ Skip ]
</span><span class="cx">
</span><ins>+# No support for Filters Level 2
+[ Mavericks ] fast/css/will-change/will-change-creates-stacking-context-inline.html [ ImageOnlyFailure ]
+
</ins><span class="cx"> # ENABLE_WILL_REVEAL_EDGE_EVENTS
</span><span class="cx"> fast/events/will-reveal-edge-on-div.html [ Skip ]
</span><span class="cx"> fast/events/will-reveal-edges-body-attributes.html [ Skip ]
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/ChangeLog (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/Source/WebCore/ChangeLog 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -1,5 +1,36 @@
</span><span class="cx"> 2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r190667. rdar://problem/23769564
+
+ 2015-10-06 Simon Fraser <simon.fraser@apple.com>
+
+ will-change should trigger stacking context based purely on properties
+ https://bugs.webkit.org/show_bug.cgi?id=148068
+
+ Reviewed by Zalan Bujtas.
+
+ Previously, our will-change implementation didn't trigger stacking context
+ on an inline if the will-change property didn't apply to inlines (like 'transform').
+ However, this doesn't agree with the CSS-WG consensus (https://lists.w3.org/Archives/Public/www-style/2015Sep/0112.html).
+
+ Change behavior to have stacking context creation behavior for will-change be
+ identical for inlines and blocks.
+
+ Test: fast/css/will-change/will-change-creates-stacking-context-inline.html
+
+ * rendering/RenderInline.cpp:
+ (WebCore::inFlowPositionedInlineAncestor):
+ * rendering/RenderInline.h:
+ (WebCore::RenderInline::willChangeCreatesStackingContext):
+ * rendering/style/WillChangeData.cpp:
+ (WebCore::propertyCreatesStackingContext):
+ (WebCore::WillChangeData::addFeature):
+ (WebCore::propertyCreatesStackingContextOnBoxesOnly): Deleted.
+ * rendering/style/WillChangeData.h:
+ (WebCore::WillChangeData::canCreateStackingContextOnInline): Deleted.
+
+2015-12-05 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r188604. rdar://problem/23769564
</span><span class="cx">
</span><span class="cx"> 2015-08-18 Simon Fraser <simon.fraser@apple.com>
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderInline.cpp (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderInline.cpp 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderInline.cpp 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> return p;
</span><span class="cx"> p = p->parent();
</span><span class="cx"> }
</span><del>- return 0;
</del><ins>+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void updateStyleOfAnonymousBlockContinuations(const RenderBlock& block, const RenderStyle* newStyle, const RenderStyle* oldStyle)
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingRenderInlineh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderInline.h (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderInline.h 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/RenderInline.h 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> bool willChangeCreatesStackingContext() const
</span><span class="cx"> {
</span><del>- return style().willChange() && style().willChange()->canCreateStackingContextOnInline();
</del><ins>+ return style().willChange() && style().willChange()->canCreateStackingContext();
</ins><span class="cx"> }
</span><span class="cx">
</span><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></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingstyleWillChangeDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.cpp (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.cpp 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.cpp 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -65,6 +65,10 @@
</span><span class="cx"> static bool propertyCreatesStackingContext(CSSPropertyID property)
</span><span class="cx"> {
</span><span class="cx"> switch (property) {
</span><ins>+ case CSSPropertyPerspective:
+ case CSSPropertyTransform:
+ case CSSPropertyTransformStyle:
+ case CSSPropertyWebkitTransformStyle:
</ins><span class="cx"> case CSSPropertyClipPath:
</span><span class="cx"> case CSSPropertyWebkitClipPath:
</span><span class="cx"> case CSSPropertyMask:
</span><span class="lines">@@ -86,19 +90,6 @@
</span><span class="cx"> #if ENABLE(CSS_REGIONS)
</span><span class="cx"> case CSSPropertyWebkitFlowFrom:
</span><span class="cx"> #endif
</span><del>- return true;
- default:
- return false;
- }
-}
-
-static bool propertyCreatesStackingContextOnBoxesOnly(CSSPropertyID property)
-{
- switch (property) {
- case CSSPropertyPerspective:
- case CSSPropertyTransform:
- case CSSPropertyTransformStyle:
- case CSSPropertyWebkitTransformStyle:
</del><span class="cx"> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
</span><span class="cx"> case CSSPropertyWebkitOverflowScrolling:
</span><span class="cx"> #endif
</span><span class="lines">@@ -142,8 +133,7 @@
</span><span class="cx"> ASSERT(feature == Property || propertyID == CSSPropertyInvalid);
</span><span class="cx"> m_animatableFeatures.append(AnimatableFeature(feature, propertyID));
</span><span class="cx">
</span><del>- m_canCreateStackingContextOnInline |= propertyCreatesStackingContext(propertyID);
- m_canCreateStackingContext |= m_canCreateStackingContextOnInline | propertyCreatesStackingContextOnBoxesOnly(propertyID);
</del><ins>+ m_canCreateStackingContext |= propertyCreatesStackingContext(propertyID);
</ins><span class="cx">
</span><span class="cx"> m_canTriggerCompositingOnInline |= propertyTriggersCompositing(propertyID);
</span><span class="cx"> m_canTriggerCompositing |= m_canTriggerCompositingOnInline | propertyTriggersCompositingOnBoxesOnly(propertyID);
</span></span></pre></div>
<a id="branchessafari601146branchSourceWebCorerenderingstyleWillChangeDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.h (193545 => 193546)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.h 2015-12-06 02:57:10 UTC (rev 193545)
+++ branches/safari-601.1.46-branch/Source/WebCore/rendering/style/WillChangeData.h 2015-12-06 02:57:16 UTC (rev 193546)
</span><span class="lines">@@ -55,8 +55,6 @@
</span><span class="cx"> bool containsProperty(CSSPropertyID) const;
</span><span class="cx">
</span><span class="cx"> bool canCreateStackingContext() const { return m_canCreateStackingContext; }
</span><del>- bool canCreateStackingContextOnInline() const { return m_canCreateStackingContextOnInline; }
-
</del><span class="cx"> bool canTriggerCompositing() const { return m_canTriggerCompositing; }
</span><span class="cx"> bool canTriggerCompositingOnInline() const { return m_canTriggerCompositingOnInline; }
</span><span class="cx">
</span><span class="lines">@@ -124,7 +122,6 @@
</span><span class="cx">
</span><span class="cx"> Vector<AnimatableFeature, 1> m_animatableFeatures;
</span><span class="cx"> bool m_canCreateStackingContext { false };
</span><del>- bool m_canCreateStackingContextOnInline { false };
</del><span class="cx"> bool m_canTriggerCompositing { false };
</span><span class="cx"> bool m_canTriggerCompositingOnInline { false };
</span><span class="cx"> };
</span></span></pre>
</div>
</div>
</body>
</html>