<!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>[193421] 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/193421">193421</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-12-04 09:10:48 -0800 (Fri, 04 Dec 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188530">r188530</a>. rdar://problem/23732374</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreChangeLog">branches/safari-601-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceJavaScriptCoreinspectorprotocolLayerTreejson">branches/safari-601-branch/Source/JavaScriptCore/inspector/protocol/LayerTree.json</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorLayerTreeAgentcpp">branches/safari-601-branch/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp</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="#branchessafari601branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingRenderLayerCompositorh">branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleRenderStylecpp">branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleRenderStyleh">branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleRenderStyleConstantsh">branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleWillChangeDatacpp">branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCorerenderingstyleWillChangeDatah">branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.h</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIChangeLog">branches/safari-601-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs">branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js</a></li>
<li><a href="#branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPaneljs">branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestscompositinglayercreationwillchangechangeexpectedtxt">branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestscompositinglayercreationwillchangechangehtml">branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change.html</a></li>
<li><a href="#branchessafari601branchLayoutTestscompositinglayercreationwillchangelayercreationexpectedtxt">branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestscompositinglayercreationwillchangelayercreationhtml">branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation.html</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 (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/LayoutTests/ChangeLog        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-12-03  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r188530. rdar://problem/23732374
+
+    2015-08-17  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+            will-change should sometimes trigger compositing
+            https://bugs.webkit.org/show_bug.cgi?id=148072
+
+            Reviewed by Tim Horton.
+
+            * compositing/layer-creation/will-change-change-expected.txt: Added.
+            * compositing/layer-creation/will-change-change.html: Added.
+            * compositing/layer-creation/will-change-layer-creation-expected.txt: Added.
+            * compositing/layer-creation/will-change-layer-creation.html: Added.
+
+2015-12-03  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r188514. rdar://problem/23732374
</span><span class="cx"> 
</span><span class="cx">     2015-08-15  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestscompositinglayercreationwillchangechangeexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change-expected.txt (0 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change-expected.txt                                (rev 0)
+++ branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change-expected.txt        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 800.00 600.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 800.00 600.00)
+      (contentsOpaque 1)
+      (children 1
+        (GraphicsLayer
+          (position 28.00 20.00)
+          (bounds 100.00 100.00)
+          (contentsOpaque 1)
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscompositinglayercreationwillchangechangehtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change.html (0 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change.html                                (rev 0)
+++ branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-change.html        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        .box {
+            width: 100px;
+            height: 100px;
+            margin: 20px;
+            background-color: blue;
+            position: relative;
+            z-index: 0; /* Avoid changes in stacking triggering compositing */
+        }
+        
+        .removal {
+            will-change: transform;
+        }
+
+        body.changed .addition {
+            will-change: transform;
+        }
+
+        body.changed .removal {
+            will-change: auto;
+        }
+    &lt;/style&gt;
+    &lt;script&gt;
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
+        }
+
+        function doTest()
+        {
+            window.setTimeout(function() {
+                document.body.classList.add('changed');
+                if (window.testRunner) {
+                    document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
+                    testRunner.notifyDone();
+                }
+            }, 0)
+        }
+        window.addEventListener('load', doTest, false);
+    &lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;div class=&quot;addition box&quot;&gt;&lt;/div&gt;
+&lt;div class=&quot;removal box&quot;&gt;&lt;/div&gt;
+&lt;pre id=&quot;layers&quot;&gt;&lt;/pre&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscompositinglayercreationwillchangelayercreationexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation-expected.txt (0 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation-expected.txt                                (rev 0)
+++ branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation-expected.txt        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+transform opacity transform, background transform, opacity -webkit-filter
+opacity
+transform
+-webkit-filter
+transform-style
+perspective
+background, clip-path, position, z-index, -webkit-mask
+(GraphicsLayer
+  (anchor 0.00 0.00)
+  (bounds 800.00 600.00)
+  (children 1
+    (GraphicsLayer
+      (bounds 800.00 600.00)
+      (contentsOpaque 1)
+      (children 6
+        (GraphicsLayer
+          (position 104.00 8.00)
+          (bounds 52.00 18.00)
+          (drawsContent 1)
+        )
+        (GraphicsLayer
+          (position 345.00 8.00)
+          (bounds 122.00 18.00)
+          (drawsContent 1)
+        )
+        (GraphicsLayer
+          (position 486.00 8.00)
+          (bounds 85.00 18.00)
+          (drawsContent 1)
+        )
+        (GraphicsLayer
+          (position 18.00 36.00)
+          (bounds 764.00 18.00)
+          (contentsOpaque 1)
+          (drawsContent 1)
+        )
+        (GraphicsLayer
+          (position 18.00 64.00)
+          (bounds 764.00 18.00)
+          (contentsOpaque 1)
+          (drawsContent 1)
+        )
+        (GraphicsLayer
+          (position 18.00 92.00)
+          (bounds 764.00 18.00)
+          (contentsOpaque 1)
+          (drawsContent 1)
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestscompositinglayercreationwillchangelayercreationhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation.html (0 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation.html                                (rev 0)
+++ branches/safari-601-branch/LayoutTests/compositing/layer-creation/will-change-layer-creation.html        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+
+&lt;html&gt;
+&lt;head&gt;
+    &lt;style&gt;
+        .box {
+            background-color: silver;
+            margin: 10px;
+        }
+        
+    &lt;/style&gt;
+    &lt;script&gt;
+    if (window.testRunner)
+        testRunner.dumpAsText();
+
+    function dumpLayers()
+    {
+        if (window.testRunner) {
+            document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
+        }
+    }
+    
+    window.addEventListener('load', dumpLayers, false);
+    &lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+
+&lt;span class=&quot;box&quot; style=&quot;will-change: transform;&quot;&gt;
+    transform
+&lt;/span&gt;
+
+&lt;span class=&quot;box&quot; style=&quot;will-change: opacity;&quot;&gt;
+    opacity
+&lt;/span&gt;
+
+&lt;span class=&quot;box&quot; style=&quot;will-change: transform, background;&quot;&gt;
+    transform, background
+&lt;/span&gt;
+
+&lt;span class=&quot;box&quot; style=&quot;will-change: transform, opacity;&quot;&gt;
+    transform, opacity
+&lt;/span&gt;
+
+&lt;span class=&quot;box&quot; style=&quot;will-change: -webkit-filter;&quot;&gt;
+    -webkit-filter
+&lt;/span&gt;
+
+&lt;div class=&quot;box&quot; style=&quot;will-change: opacity;&quot;&gt;
+    opacity
+&lt;/div&gt;
+
+&lt;div class=&quot;box&quot; style=&quot;will-change: transform;&quot;&gt;
+    transform
+&lt;/div&gt;
+
+&lt;div class=&quot;box&quot; style=&quot;will-change: -webkit-filter;&quot;&gt;
+    -webkit-filter
+&lt;/div&gt;
+
+&lt;div class=&quot;box&quot; style=&quot;will-change: transform-style;&quot;&gt;
+    transform-style
+&lt;/div&gt;
+
+&lt;div class=&quot;box&quot; style=&quot;will-change: perspective;&quot;&gt;
+    perspective
+&lt;/div&gt;
+
+&lt;div class=&quot;box&quot; style=&quot;will-change: background, clip-path, position, z-index, -webkit-mask;&quot;&gt;
+    background, clip-path, position, z-index, -webkit-mask
+&lt;/div&gt;
+
+&lt;pre id=&quot;layers&quot;&gt;&lt;/pre&gt;
+
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/ChangeLog (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/ChangeLog        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/JavaScriptCore/ChangeLog        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-12-03  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r188530. rdar://problem/23732374
+
+    2015-08-17  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+            will-change should sometimes trigger compositing
+            https://bugs.webkit.org/show_bug.cgi?id=148072
+
+            Reviewed by Tim Horton.
+
+            Include will-change as a reason for compositing.
+
+            * inspector/protocol/LayerTree.json:
+
</ins><span class="cx"> 2015-12-02  Timothy Hatcher  &lt;timothy@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Merge r191967. rdar://problem/23221163
</span></span></pre></div>
<a id="branchessafari601branchSourceJavaScriptCoreinspectorprotocolLayerTreejson"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/JavaScriptCore/inspector/protocol/LayerTree.json (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/JavaScriptCore/inspector/protocol/LayerTree.json        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/JavaScriptCore/inspector/protocol/LayerTree.json        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx">                 { &quot;name&quot;: &quot;isolatesCompositedBlendingDescendants&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Composition due to association with an element isolating compositing descendants having CSS blending applied.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;perspective&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Composition due to association with an element with perspective applied.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;preserve3D&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Composition due to association with an element with a \&quot;transform-style: preserve-3d\&quot; style.&quot; },
</span><ins>+                { &quot;name&quot;: &quot;willChange&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Composition due to association with an element with a \&quot;will-change\&quot; style.&quot; },
</ins><span class="cx">                 { &quot;name&quot;: &quot;root&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Composition due to association with the root element.&quot; },
</span><span class="cx">                 { &quot;name&quot;: &quot;blending&quot;, &quot;type&quot;: &quot;boolean&quot;, &quot;optional&quot;: true, &quot;description&quot;: &quot;Composition due to association with an element with a \&quot;blend-mode\&quot; style.&quot; }
</span><span class="cx">             ]
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -1,5 +1,71 @@
</span><span class="cx"> 2015-12-03  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Merge r188530. rdar://problem/23732374
+
+    2015-08-17  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+            will-change should sometimes trigger compositing
+            https://bugs.webkit.org/show_bug.cgi?id=148072
+
+            Reviewed by Tim Horton.
+
+            Implement the compositing side-effects of will-change, if any of the
+            following properties are specified:
+                opacity
+                filter (as -webkit-filter)
+                backdrop-filter (as -webkit-backdrop-filter)
+                transform (on transformable elements only)
+
+            Tests: compositing/layer-creation/will-change-change.html
+                   compositing/layer-creation/will-change-layer-creation.html
+
+            * inspector/InspectorLayerTreeAgent.cpp:
+            (WebCore::InspectorLayerTreeAgent::reasonsForCompositingLayer): Tell the inspector
+            about will-change.
+            * rendering/RenderElement.cpp:
+            (WebCore::RenderElement::adjustStyleDifference): Need to trigger a recomposite if
+            will-change includes a compositing trigger property. This gets called before and
+            after setting the style, so this checks both states.
+            (WebCore::RenderElement::shouldWillChangeCreateStackingContext):
+            * rendering/RenderElement.h:
+            (WebCore::RenderElement::willChangeCreatesStackingContext): Helper function that
+            RenderInline uses to determine if it needs to create a RenderLayer, since RenderInline
+            doesn't get automatic layer RenderLayers as a side effect of having non-auto z-index
+            in the style.
+            * rendering/RenderInline.h: Need to trigger a RenderLayer if will-change includes
+            a property that applies to inlines.
+            * rendering/RenderLayerCompositor.cpp:
+            (WebCore::RenderLayerCompositor::requiresCompositingLayer): Call requiresCompositingForWillChange().
+            (WebCore::RenderLayerCompositor::requiresOwnBackingStore): Call requiresCompositingForWillChange().
+            (WebCore::RenderLayerCompositor::reasonsForCompositing): Include requiresCompositingForWillChange().
+            (WebCore::RenderLayerCompositor::requiresCompositingForWillChange): If will-change contains a
+            property that would trigger compositing on this element, return true.
+            * rendering/RenderLayerCompositor.h:
+            * rendering/style/RenderStyle.cpp:
+            (WebCore::RenderStyle::changeRequiresLayout): Set ContextSensitivePropertyWillChange in
+            changedContextSensitiveProperties if will-change changes.
+            * rendering/style/RenderStyle.h: Rename for clarity.
+            * rendering/style/RenderStyleConstants.h: Add ContextSensitivePropertyWillChange.
+            * rendering/style/WillChangeData.cpp:
+            (WebCore::propertyCreatesStackingContext): Subset of properties that create stacking
+            context on any element.
+            (WebCore::propertyCreatesStackingContextOnBoxesOnly): Additional properties that
+            create stacking context on boxes.
+            (WebCore::propertyTriggersCompositing): Properties that trigger compositing on
+            any element.
+            (WebCore::propertyTriggersCompositingOnBoxesOnly): Additional properties that
+            trigger compositing on boxes.
+            (WebCore::WillChangeData::addFeature): As features are added, manage a set of
+            flags to know if they trigger stacking context or compositing, on inlines and boxes.
+            (WebCore::WillChangeData::createsStackingContext): Deleted.
+            * rendering/style/WillChangeData.h:
+            (WebCore::WillChangeData::canCreateStackingContext):
+            (WebCore::WillChangeData::canCreateStackingContextOnInline):
+            (WebCore::WillChangeData::canTriggerCompositing):
+            (WebCore::WillChangeData::canTriggerCompositingOnInline):
+
+2015-12-03  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
</ins><span class="cx">         Merge r188514. rdar://problem/23732374
</span><span class="cx"> 
</span><span class="cx">     2015-08-15  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorLayerTreeAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -307,6 +307,9 @@
</span><span class="cx">     if (reasonsBitmask &amp; CompositingReasonPreserve3D)
</span><span class="cx">         compositingReasons-&gt;setPreserve3D(true);
</span><span class="cx"> 
</span><ins>+    if (reasonsBitmask &amp; CompositingReasonWillChange)
+        compositingReasons-&gt;setWillChange(true);
+
</ins><span class="cx">     if (reasonsBitmask &amp; CompositingReasonRoot)
</span><span class="cx">         compositingReasons-&gt;setRoot(true);
</span><span class="cx">     
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderElement.cpp        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -283,6 +283,11 @@
</span><span class="cx">             diff = std::max(diff, StyleDifferenceRepaint);
</span><span class="cx">     }
</span><span class="cx">     
</span><ins>+    if (contextSensitiveProperties &amp; ContextSensitivePropertyWillChange) {
+        if (style().willChange() &amp;&amp; style().willChange()-&gt;canTriggerCompositing())
+            diff = std::max(diff, StyleDifferenceRecompositeLayer);
+    }
+    
</ins><span class="cx">     if ((contextSensitiveProperties &amp; ContextSensitivePropertyFilter) &amp;&amp; hasLayer()) {
</span><span class="cx">         RenderLayer* layer = downcast&lt;RenderLayerModelObject&gt;(*this).layer();
</span><span class="cx">         if (!layer-&gt;isComposited() || layer-&gt;paintsWithFilters())
</span><span class="lines">@@ -1441,6 +1446,16 @@
</span><span class="cx">     return true;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool RenderElement::shouldWillChangeCreateStackingContext() const
+{
+    ASSERT(style().willChange());
+    ASSERT(style().willChange()-&gt;canCreateStackingContext());
+
+    // On inlines, we only want to trigger RenderLayer creation
+    // if will-change contains a property that applies to inlines.
+    return is&lt;RenderBox&gt;(this) || (is&lt;RenderInline&gt;(this) &amp;&amp; style().willChange()-&gt;canCreateStackingContextOnInline());
+}
+
</ins><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 (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderElement.h        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -164,6 +164,10 @@
</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><ins>+    bool willChangeCreatesStackingContext() const
+    {
+        return style().willChange() &amp;&amp; style().willChange()-&gt;canCreateStackingContext() &amp;&amp; shouldWillChangeCreateStackingContext();
+    }
</ins><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 class="lines">@@ -298,6 +302,8 @@
</span><span class="cx">     bool getLeadingCorner(FloatPoint&amp; output) const;
</span><span class="cx">     bool getTrailingCorner(FloatPoint&amp; output) const;
</span><span class="cx"> 
</span><ins>+    bool shouldWillChangeCreateStackingContext() const;
+
</ins><span class="cx">     unsigned m_baseTypeFlags : 6;
</span><span class="cx">     unsigned m_ancestorLineBoxDirty : 1;
</span><span class="cx">     unsigned m_hasInitializedStyle : 1;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderInlineh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderInline.h        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> 
</span><span class="cx">     virtual bool nodeAtPoint(const HitTestRequest&amp;, HitTestResult&amp;, const HitTestLocation&amp; locationInContainer, const LayoutPoint&amp; accumulatedOffset, HitTestAction) override final;
</span><span class="cx"> 
</span><del>-    virtual bool requiresLayer() const override { return isInFlowPositioned() || createsGroup() || hasClipPath(); }
</del><ins>+    virtual bool requiresLayer() const override { return isInFlowPositioned() || createsGroup() || hasClipPath() || willChangeCreatesStackingContext(); }
</ins><span class="cx"> 
</span><span class="cx">     virtual LayoutUnit offsetLeft() const override final;
</span><span class="cx">     virtual LayoutUnit offsetTop() const override final;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -2190,6 +2190,7 @@
</span><span class="cx">         || clipsCompositingDescendants(*renderer.layer())
</span><span class="cx">         || requiresCompositingForAnimation(renderer)
</span><span class="cx">         || requiresCompositingForFilters(renderer)
</span><ins>+        || requiresCompositingForWillChange(renderer)
</ins><span class="cx">         || requiresCompositingForPosition(renderer, *renderer.layer(), viewportConstrainedNotCompositedReason)
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">         || requiresCompositingForScrolling(*renderer.layer())
</span><span class="lines">@@ -2232,6 +2233,7 @@
</span><span class="cx">         || requiresCompositingForBackfaceVisibility(renderer)
</span><span class="cx">         || requiresCompositingForAnimation(renderer)
</span><span class="cx">         || requiresCompositingForFilters(renderer)
</span><ins>+        || requiresCompositingForWillChange(renderer)
</ins><span class="cx">         || requiresCompositingForPosition(renderer, layer)
</span><span class="cx">         || requiresCompositingForOverflowScrolling(layer)
</span><span class="cx">         || renderer.isTransparent()
</span><span class="lines">@@ -2293,6 +2295,9 @@
</span><span class="cx">     if (requiresCompositingForFilters(renderer))
</span><span class="cx">         reasons |= CompositingReasonFilters;
</span><span class="cx"> 
</span><ins>+    if (requiresCompositingForWillChange(renderer))
+        reasons |= CompositingReasonWillChange;
+
</ins><span class="cx">     if (requiresCompositingForPosition(renderer, *renderer.layer()))
</span><span class="cx">         reasons |= renderer.style().position() == FixedPosition ? CompositingReasonPositionFixed : CompositingReasonPositionSticky;
</span><span class="cx"> 
</span><span class="lines">@@ -2658,6 +2663,17 @@
</span><span class="cx">     return renderer.hasFilter();
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool RenderLayerCompositor::requiresCompositingForWillChange(RenderLayerModelObject&amp; renderer) const
+{
+    if (!renderer.style().willChange() || !renderer.style().willChange()-&gt;canTriggerCompositing())
+        return false;
+
+    if (is&lt;RenderBox&gt;(renderer))
+        return true;
+
+    return renderer.style().willChange()-&gt;canTriggerCompositingOnInline();
+}
+
</ins><span class="cx"> bool RenderLayerCompositor::isAsyncScrollableStickyLayer(const RenderLayer&amp; layer, const RenderLayer** enclosingAcceleratedOverflowLayer) const
</span><span class="cx"> {
</span><span class="cx">     ASSERT(layer.renderer().isStickyPositioned());
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingRenderLayerCompositorh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.h (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.h        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/RenderLayerCompositor.h        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -80,8 +80,9 @@
</span><span class="cx">     CompositingReasonBlendingWithCompositedDescendants      = 1 &lt;&lt; 20,
</span><span class="cx">     CompositingReasonPerspective                            = 1 &lt;&lt; 21,
</span><span class="cx">     CompositingReasonPreserve3D                             = 1 &lt;&lt; 22,
</span><del>-    CompositingReasonRoot                                   = 1 &lt;&lt; 23,
-    CompositingReasonIsolatesCompositedBlendingDescendants  = 1 &lt;&lt; 24,
</del><ins>+    CompositingReasonWillChange                             = 1 &lt;&lt; 23,
+    CompositingReasonRoot                                   = 1 &lt;&lt; 24,
+    CompositingReasonIsolatesCompositedBlendingDescendants  = 1 &lt;&lt; 25,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned CompositingReasons;
</span><span class="cx"> 
</span><span class="lines">@@ -422,6 +423,7 @@
</span><span class="cx">     bool requiresCompositingForPlugin(RenderLayerModelObject&amp;) const;
</span><span class="cx">     bool requiresCompositingForFrame(RenderLayerModelObject&amp;) const;
</span><span class="cx">     bool requiresCompositingForFilters(RenderLayerModelObject&amp;) const;
</span><ins>+    bool requiresCompositingForWillChange(RenderLayerModelObject&amp;) const;
</ins><span class="cx">     bool requiresCompositingForScrollableFrame() const;
</span><span class="cx">     bool requiresCompositingForPosition(RenderLayerModelObject&amp;, const RenderLayer&amp;, RenderLayer::ViewportConstrainedNotCompositedReason* = nullptr) const;
</span><span class="cx">     bool requiresCompositingForOverflowScrolling(const RenderLayer&amp;) const;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleRenderStylecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.cpp (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.cpp        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.cpp        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -554,6 +554,11 @@
</span><span class="cx">         if (rareNonInheritedData-&gt;m_dashboardRegions != other.rareNonInheritedData-&gt;m_dashboardRegions)
</span><span class="cx">             return true;
</span><span class="cx"> #endif
</span><ins>+
+        if (!rareNonInheritedData-&gt;willChangeDataEquivalent(*other.rareNonInheritedData.get())) {
+            changedContextSensitiveProperties |= ContextSensitivePropertyWillChange;
+            // Don't return; keep looking for another change
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (rareInheritedData.get() != other.rareInheritedData.get()) {
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleRenderStyleh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyle.h        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -1805,7 +1805,7 @@
</span><span class="cx">         if (!willChange())
</span><span class="cx">             return false;
</span><span class="cx">         
</span><del>-        return willChange()-&gt;createsStackingContext();
</del><ins>+        return willChange()-&gt;canCreateStackingContext();
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     const AtomicString&amp; hyphenString() const;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleRenderStyleConstantsh"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/RenderStyleConstants.h        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -69,7 +69,8 @@
</span><span class="cx">     ContextSensitivePropertyOpacity     = 1 &lt;&lt; 1,
</span><span class="cx">     ContextSensitivePropertyFilter      = 1 &lt;&lt; 2,
</span><span class="cx">     ContextSensitivePropertyClipRect    = 1 &lt;&lt; 3,
</span><del>-    ContextSensitivePropertyClipPath    = 1 &lt;&lt; 4
</del><ins>+    ContextSensitivePropertyClipPath    = 1 &lt;&lt; 4,
+    ContextSensitivePropertyWillChange  = 1 &lt;&lt; 5,
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> // Static pseudo styles. Dynamic ones are produced on the fly.
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCorerenderingstyleWillChangeDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.cpp        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -84,13 +84,22 @@
</span><span class="cx">     case CSSPropertyWebkitMask:
</span><span class="cx">     case CSSPropertyWebkitMaskImage:
</span><span class="cx">     case CSSPropertyWebkitMaskBoxImage:
</span><ins>+#if ENABLE(CSS_REGIONS)
+    case CSSPropertyWebkitFlowFrom:
+#endif
+        return true;
+    default:
+        return false;
+    }
+}
+
+static bool propertyCreatesStackingContextOnBoxesOnly(CSSPropertyID property)
+{
+    switch (property) {
</ins><span class="cx">     case CSSPropertyPerspective:
</span><span class="cx">     case CSSPropertyTransform:
</span><span class="cx">     case CSSPropertyTransformStyle:
</span><span class="cx">     case CSSPropertyWebkitTransformStyle:
</span><del>-#if ENABLE(CSS_REGIONS)
-    case CSSPropertyWebkitFlowFrom:
-#endif
</del><span class="cx"> #if ENABLE(ACCELERATED_OVERFLOW_SCROLLING)
</span><span class="cx">     case CSSPropertyWebkitOverflowScrolling:
</span><span class="cx"> #endif
</span><span class="lines">@@ -100,19 +109,45 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool WillChangeData::createsStackingContext() const
</del><ins>+static bool propertyTriggersCompositing(CSSPropertyID property)
</ins><span class="cx"> {
</span><del>-    for (const auto&amp; feature : m_animatableFeatures) {
-        if (feature.feature() == Property &amp;&amp; propertyCreatesStackingContext(feature.property()))
-            return true;
</del><ins>+    switch (property) {
+    case CSSPropertyOpacity:
+    case CSSPropertyWebkitFilter:
+#if ENABLE(FILTERS_LEVEL_2)
+    case CSSPropertyWebkitBackdropFilter:
+#endif
+        return true;
+    default:
+        return false;
</ins><span class="cx">     }
</span><del>-    return false;
</del><span class="cx"> }
</span><span class="cx"> 
</span><ins>+static bool propertyTriggersCompositingOnBoxesOnly(CSSPropertyID property)
+{
+    // Don't trigger for perspective and transform-style, because those
+    // only do compositing if they have a 3d-transformed descendant and
+    // we don't want to do compositing all the time.
+    // Similarly, we don't want -webkit-overflow-scrolling-touch to
+    // always composite if there's no scrollable overflow.
+    switch (property) {
+    case CSSPropertyTransform:
+        return true;
+    default:
+        return false;
+    }
+}
+
</ins><span class="cx"> void WillChangeData::addFeature(Feature feature, CSSPropertyID propertyID)
</span><span class="cx"> {
</span><span class="cx">     ASSERT(feature == Property || propertyID == CSSPropertyInvalid);
</span><span class="cx">     m_animatableFeatures.append(AnimatableFeature(feature, propertyID));
</span><ins>+
+    m_canCreateStackingContextOnInline |= propertyCreatesStackingContext(propertyID);
+    m_canCreateStackingContext |= m_canCreateStackingContextOnInline | propertyCreatesStackingContextOnBoxesOnly(propertyID);
+
+    m_canTriggerCompositingOnInline |= propertyTriggersCompositing(propertyID);
+    m_canTriggerCompositing |= m_canTriggerCompositingOnInline | propertyTriggersCompositingOnBoxesOnly(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="branchessafari601branchSourceWebCorerenderingstyleWillChangeDatah"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.h (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.h        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebCore/rendering/style/WillChangeData.h        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -53,8 +53,13 @@
</span><span class="cx">     bool containsScrollPosition() const;
</span><span class="cx">     bool containsContents() const;
</span><span class="cx">     bool containsProperty(CSSPropertyID) const;
</span><del>-    bool createsStackingContext() const;
</del><span class="cx"> 
</span><ins>+    bool canCreateStackingContext() const { return m_canCreateStackingContext; }
+    bool canCreateStackingContextOnInline() const { return m_canCreateStackingContextOnInline; }
+
+    bool canTriggerCompositing() const { return m_canTriggerCompositing; }
+    bool canTriggerCompositingOnInline() const { return m_canTriggerCompositingOnInline; }
+
</ins><span class="cx">     enum Feature {
</span><span class="cx">         ScrollPosition,
</span><span class="cx">         Contents,
</span><span class="lines">@@ -118,6 +123,10 @@
</span><span class="cx">     };
</span><span class="cx"> 
</span><span class="cx">     Vector&lt;AnimatableFeature, 1&gt; m_animatableFeatures;
</span><ins>+    bool m_canCreateStackingContext { false };
+    bool m_canCreateStackingContextOnInline { false };
+    bool m_canTriggerCompositing { false };
+    bool m_canTriggerCompositingOnInline { false };
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/ChangeLog (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/ChangeLog        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebInspectorUI/ChangeLog        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-12-03  Matthew Hanson  &lt;matthew_hanson@apple.com&gt;
+
+        Merge r188530. rdar://problem/23732374
+
+    2015-08-17  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+            will-change should sometimes trigger compositing
+            https://bugs.webkit.org/show_bug.cgi?id=148072
+
+            Reviewed by Tim Horton.
+
+            Have the web inspector show a correct compositing reason for will-change.
+            This could be improved to indicate which specific value in will-change triggered
+            the compositing.
+
+            * Localizations/en.lproj/localizedStrings.js:
+            * UserInterface/Views/LayerTreeDetailsSidebarPanel.js:
+            (WebInspector.LayerTreeDetailsSidebarPanel.prototype._populateListOfCompositingReasons):
+            (WebInspector.LayerTreeDetailsSidebarPanel):
+
</ins><span class="cx"> 2015-12-03  Timothy Hatcher  &lt;timothy@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Address warnings from the console.assert stripping phase
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUILocalizationsenlprojlocalizedStringsjs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebInspectorUI/Localizations/en.lproj/localizedStrings.js        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -240,6 +240,7 @@
</span><span class="cx"> localizedStrings[&quot;Element has  position: fixed  style&quot;] = &quot;Element has  position: fixed  style&quot;;
</span><span class="cx"> localizedStrings[&quot;Element has  position: sticky  style&quot;] = &quot;Element has  position: sticky  style&quot;;
</span><span class="cx"> localizedStrings[&quot;Element has  transform-style: preserve-3d  style&quot;] = &quot;Element has  transform-style: preserve-3d  style&quot;;
</span><ins>+localizedStrings[&quot;Element has  will-change  style with includes opacity, transform, transform-style, perspective, filter or backdrop-filter&quot;] = &quot;Element has  will-change  style with includes opacity, transform, transform-style, perspective, filter or backdrop-filter&quot;;
</ins><span class="cx"> localizedStrings[&quot;Element is &lt;canvas&gt;&quot;] = &quot;Element is &lt;canvas&gt;&quot;;
</span><span class="cx"> localizedStrings[&quot;Element is &lt;iframe&gt;&quot;] = &quot;Element is &lt;iframe&gt;&quot;;
</span><span class="cx"> localizedStrings[&quot;Element is &lt;video&gt;&quot;] = &quot;Element is &lt;video&gt;&quot;;
</span></span></pre></div>
<a id="branchessafari601branchSourceWebInspectorUIUserInterfaceViewsLayerTreeDetailsSidebarPaneljs"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js (193420 => 193421)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js        2015-12-04 17:10:40 UTC (rev 193420)
+++ branches/safari-601-branch/Source/WebInspectorUI/UserInterface/Views/LayerTreeDetailsSidebarPanel.js        2015-12-04 17:10:48 UTC (rev 193421)
</span><span class="lines">@@ -427,6 +427,8 @@
</span><span class="cx">             addReason(WebInspector.UIString(&quot;Element has perspective applied&quot;));
</span><span class="cx">         if (compositingReasons.preserve3D)
</span><span class="cx">             addReason(WebInspector.UIString(&quot;Element has “transform-style: preserve-3d” style&quot;));
</span><ins>+        if (compositingReasons.willChange)
+            addReason(WebInspector.UIString(&quot;Element has “will-change” style with includes opacity, transform, transform-style, perspective, filter or backdrop-filter&quot;));
</ins><span class="cx">         if (compositingReasons.root)
</span><span class="cx">             addReason(WebInspector.UIString(&quot;Element is the root element&quot;));
</span><span class="cx">         if (compositingReasons.blending)
</span></span></pre>
</div>
</div>

</body>
</html>