<!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>[184932] trunk</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/184932">184932</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-05-27 17:39:35 -0700 (Wed, 27 May 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/183820">r183820</a>): webkit.org/blog/ background painting issue on reload, when the page contains videos
https://bugs.webkit.org/show_bug.cgi?id=145420

Reviewed by Dean Jackson.
Source/WebCore:

After <a href="http://trac.webkit.org/projects/webkit/changeset/183820">r183820</a>, the media controls no longer had a wrapper that created CSS stacking context.
The media controls on Mac use mix-blend-mode, which causes the compositing code to look for
a stacking context ancestor and make it composited. After this change, it would walk up
to a layer outside of the media element (e.g. the document element's layer), and make
that composited. This triggered bugs with root background painting.

Prevent mix-blend-mode affecting content outside the media elements by having the media element's
layer act as a stacking context.

Test: media/controls-layers.html

* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::RenderLayer):
* rendering/RenderLayer.h:

LayoutTests:

Test that dumps compositing layers in a document with media controls.

* media/controls-layers.html: Added.
* platform/mac/media/controls-layers-expected.txt: Added.
* platform/mac-mavericks/media/controls-layers-expected.txt: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsmediacontrolslayershtml">trunk/LayoutTests/media/controls-layers.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacmediacontrolslayersexpectedtxt">trunk/LayoutTests/platform/mac/media/controls-layers-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksmediacontrolslayersexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/media/controls-layers-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (184931 => 184932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-05-28 00:34:39 UTC (rev 184931)
+++ trunk/LayoutTests/ChangeLog        2015-05-28 00:39:35 UTC (rev 184932)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-05-27  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        REGRESSION (r183820): webkit.org/blog/ background painting issue on reload, when the page contains videos
+        https://bugs.webkit.org/show_bug.cgi?id=145420
+
+        Reviewed by Dean Jackson.
+        
+        Test that dumps compositing layers in a document with media controls.
+
+        * media/controls-layers.html: Added.
+        * platform/mac/media/controls-layers-expected.txt: Added.
+        * platform/mac-mavericks/media/controls-layers-expected.txt: Added.
+
</ins><span class="cx"> 2015-05-27  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Update Mac WebKit1 TestExpectations for platform/mac/fast/ruby/ruby-expansion-cjk-2.html
</span></span></pre></div>
<a id="trunkLayoutTestsmediacontrolslayershtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/media/controls-layers.html (0 => 184932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/controls-layers.html                                (rev 0)
+++ trunk/LayoutTests/media/controls-layers.html        2015-05-28 00:39:35 UTC (rev 184932)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+&lt;html&gt;
+&lt;head&gt;
+    &lt;script src=&quot;media-file.js&quot;&gt;&lt;/script&gt;
+    &lt;style&gt;
+        body {
+            position: absolute;
+            background-image: linear-gradient(white, silver);
+        }
+    &lt;/style&gt;
+    &lt;script&gt;
+        if (window.testRunner)
+            testRunner.dumpAsText();
+
+        function doTest()
+        {
+            setSrcByTagName(&quot;audio&quot;, findMediaFile(&quot;audio&quot;, &quot;content/test&quot;));
+            setSrcByTagName(&quot;video&quot;, findMediaFile(&quot;video&quot;, &quot;content/test&quot;));
+
+            if (window.testRunner) {
+                testRunner.waitUntilDone();
+                setTimeout(function() { 
+                    document.body.appendChild(document.createTextNode('FAIL')); 
+                    if (window.testRunner)
+                            testRunner.notifyDone();
+                } , 8000);
+            }
+
+            var count = document.getElementsByTagName('audio').length + document.getElementsByTagName('video').length;
+            document.addEventListener(&quot;canplaythrough&quot;, function () {
+                if (!--count) {
+                    if (window.testRunner) {
+                        document.getElementById('layers').textContent = window.internals.layerTreeAsText(document);
+                        testRunner.notifyDone();
+                    }
+                }
+            }, true);
+        }
+
+        window.addEventListener('load', doTest, false);
+    &lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;video controls&gt;&lt;/video&gt;
+&lt;audio controls&gt;&lt;/audio&gt;
+&lt;pre id=&quot;layers&quot;&gt;&lt;/pre&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmediacontrolslayersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/media/controls-layers-expected.txt (0 => 184932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/media/controls-layers-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac/media/controls-layers-expected.txt        2015-05-28 00:39:35 UTC (rev 184932)
</span><span class="lines">@@ -0,0 +1,179 @@
</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
+          (bounds 800.00 600.00)
+          (drawsContent 1)
+          (children 22
+            (GraphicsLayer
+              (position 8.00 8.00)
+              (bounds 320.00 240.00)
+            )
+            (GraphicsLayer
+              (position 8.00 8.00)
+              (bounds 320.00 240.00)
+            )
+            (GraphicsLayer
+              (position 8.00 203.00)
+              (bounds 320.00 45.00)
+            )
+            (GraphicsLayer
+              (position 8.00 203.00)
+              (bounds 320.00 45.00)
+              (children 2
+                (GraphicsLayer
+                  (bounds 320.00 45.00)
+                )
+                (GraphicsLayer
+                  (bounds 320.00 45.00)
+                  (blendMode lighten)
+                  (contentsOpaque 1)
+                )
+              )
+            )
+            (GraphicsLayer
+              (position 16.00 228.00)
+              (anchor 0.50 0.53)
+              (bounds 12.00 15.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 44.00 227.00)
+              (anchor 0.50 0.56)
+              (bounds 16.00 16.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 68.00 227.00)
+              (bounds 201.00 17.00)
+            )
+            (GraphicsLayer
+              (position 76.00 228.00)
+              (bounds 32.00 14.00)
+              (opacity 0.45)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 118.00 227.00)
+              (bounds 96.00 17.00)
+            )
+            (GraphicsLayer
+              (position 118.00 227.00)
+              (bounds 96.00 17.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 224.00 228.00)
+              (bounds 37.00 14.00)
+              (opacity 0.45)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 277.00 223.00)
+              (bounds 14.00 25.00)
+            )
+            (GraphicsLayer
+              (position 252.00 243.00)
+              (opacity 0.00)
+              (drawsContent 1)
+              (children 1
+                (GraphicsLayer
+                  (bounds 63.00 0.00)
+                  (children 1
+                    (GraphicsLayer
+                      (drawsContent 1)
+                    )
+                  )
+                )
+              )
+            )
+            (GraphicsLayer
+              (position 277.00 228.00)
+              (anchor 0.50 0.53)
+              (bounds 14.00 15.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 307.00 228.00)
+              (anchor 0.50 0.53)
+              (bounds 14.00 15.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 332.00 203.00)
+              (bounds 200.00 45.00)
+              (children 2
+                (GraphicsLayer
+                  (bounds 200.00 45.00)
+                )
+                (GraphicsLayer
+                  (bounds 200.00 45.00)
+                  (blendMode lighten)
+                  (contentsOpaque 1)
+                )
+              )
+            )
+            (GraphicsLayer
+              (position 340.00 228.00)
+              (anchor 0.50 0.53)
+              (bounds 12.00 15.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 368.00 227.00)
+              (anchor 0.50 0.56)
+              (bounds 16.00 16.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 392.00 235.00)
+              (bounds 0.00 1.00)
+            )
+            (GraphicsLayer
+              (position 510.00 223.00)
+              (bounds 14.00 25.00)
+            )
+            (GraphicsLayer
+              (position 485.00 243.00)
+              (opacity 0.00)
+              (drawsContent 1)
+              (children 1
+                (GraphicsLayer
+                  (bounds 63.00 0.00)
+                  (children 1
+                    (GraphicsLayer
+                      (drawsContent 1)
+                    )
+                  )
+                )
+              )
+            )
+            (GraphicsLayer
+              (position 510.00 228.00)
+              (anchor 0.50 0.53)
+              (bounds 14.00 15.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+          )
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksmediacontrolslayersexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-mavericks/media/controls-layers-expected.txt (0 => 184932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/media/controls-layers-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/media/controls-layers-expected.txt        2015-05-28 00:39:35 UTC (rev 184932)
</span><span class="lines">@@ -0,0 +1,124 @@
</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
+          (bounds 800.00 600.00)
+          (drawsContent 1)
+          (children 4
+            (GraphicsLayer
+              (position 8.00 8.00)
+              (bounds 320.00 240.00)
+              (children 14
+                (GraphicsLayer
+                  (bounds 320.00 240.00)
+                )
+                (GraphicsLayer
+                  (position 0.00 195.00)
+                  (bounds 320.00 45.00)
+                )
+                (GraphicsLayer
+                  (position 0.00 195.00)
+                  (bounds 320.00 45.00)
+                  (drawsContent 1)
+                )
+                (GraphicsLayer
+                  (position 8.00 220.00)
+                  (anchor 0.50 0.53)
+                  (bounds 12.00 15.00)
+                  (blendMode plus-lighter)
+                  (drawsContent 1)
+                )
+                (GraphicsLayer
+                  (position 36.00 219.00)
+                  (anchor 0.50 0.56)
+                  (bounds 16.00 16.00)
+                  (blendMode plus-lighter)
+                  (drawsContent 1)
+                )
+                (GraphicsLayer
+                  (position 60.00 219.00)
+                  (bounds 201.00 17.00)
+                )
+                (GraphicsLayer
+                  (position 68.00 220.00)
+                  (bounds 32.00 14.00)
+                  (opacity 0.45)
+                  (blendMode plus-lighter)
+                  (drawsContent 1)
+                )
+                (GraphicsLayer
+                  (position 110.00 219.00)
+                  (bounds 96.00 17.00)
+                )
+                (GraphicsLayer
+                  (position 110.00 219.00)
+                  (bounds 96.00 17.00)
+                  (blendMode plus-lighter)
+                  (drawsContent 1)
+                )
+                (GraphicsLayer
+                  (position 216.00 220.00)
+                  (bounds 37.00 14.00)
+                  (opacity 0.45)
+                  (blendMode plus-lighter)
+                  (drawsContent 1)
+                )
+                (GraphicsLayer
+                  (position 269.00 215.00)
+                  (bounds 14.00 25.00)
+                )
+                (GraphicsLayer
+                  (position 244.00 235.00)
+                  (opacity 0.00)
+                  (drawsContent 1)
+                )
+                (GraphicsLayer
+                  (position 269.00 220.00)
+                  (anchor 0.50 0.53)
+                  (bounds 14.00 15.00)
+                  (blendMode plus-lighter)
+                  (drawsContent 1)
+                )
+                (GraphicsLayer
+                  (position 299.00 220.00)
+                  (anchor 0.50 0.53)
+                  (bounds 14.00 15.00)
+                  (blendMode plus-lighter)
+                  (drawsContent 1)
+                )
+              )
+            )
+            (GraphicsLayer
+              (position 340.00 228.00)
+              (anchor 0.50 0.53)
+              (bounds 12.00 15.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 368.00 227.00)
+              (anchor 0.50 0.56)
+              (bounds 16.00 16.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+            (GraphicsLayer
+              (position 510.00 228.00)
+              (anchor 0.50 0.53)
+              (bounds 14.00 15.00)
+              (blendMode plus-lighter)
+              (drawsContent 1)
+            )
+          )
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (184931 => 184932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-05-28 00:34:39 UTC (rev 184931)
+++ trunk/Source/WebCore/ChangeLog        2015-05-28 00:39:35 UTC (rev 184932)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-05-27  Simon Fraser  &lt;simon.fraser@apple.com&gt;
+
+        REGRESSION (r183820): webkit.org/blog/ background painting issue on reload, when the page contains videos
+        https://bugs.webkit.org/show_bug.cgi?id=145420
+
+        Reviewed by Dean Jackson.
+
+        After r183820, the media controls no longer had a wrapper that created CSS stacking context.
+        The media controls on Mac use mix-blend-mode, which causes the compositing code to look for
+        a stacking context ancestor and make it composited. After this change, it would walk up
+        to a layer outside of the media element (e.g. the document element's layer), and make
+        that composited. This triggered bugs with root background painting.
+
+        Prevent mix-blend-mode affecting content outside the media elements by having the media element's
+        layer act as a stacking context.
+
+        Test: media/controls-layers.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::RenderLayer):
+        * rendering/RenderLayer.h:
+
</ins><span class="cx"> 2015-05-27  Andreas Kling  &lt;akling@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [WK2] Local storage areas should get torn down when they have no remaining references.
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (184931 => 184932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-05-28 00:34:39 UTC (rev 184931)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp        2015-05-28 00:39:35 UTC (rev 184932)
</span><span class="lines">@@ -261,7 +261,9 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RenderLayer::RenderLayer(RenderLayerModelObject&amp; rendererLayerModelObject)
</span><del>-    : m_inResizeMode(false)
</del><ins>+    : m_isRootLayer(rendererLayerModelObject.isRenderView())
+    , m_forcedStackingContext(rendererLayerModelObject.isMedia())
+    , m_inResizeMode(false)
</ins><span class="cx">     , m_scrollDimensionsDirty(true)
</span><span class="cx">     , m_normalFlowListDirty(true)
</span><span class="cx">     , m_hasSelfPaintingLayerDescendant(false)
</span><span class="lines">@@ -270,7 +272,6 @@
</span><span class="cx">     , m_hasOutOfFlowPositionedDescendantDirty(true)
</span><span class="cx">     , m_needsCompositedScrolling(false)
</span><span class="cx">     , m_descendantsAreContiguousInStackingOrder(false)
</span><del>-    , m_isRootLayer(rendererLayerModelObject.isRenderView())
</del><span class="cx">     , m_usedTransparency(false)
</span><span class="cx">     , m_paintingInsideReflection(false)
</span><span class="cx">     , m_inOverflowRelayout(false)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (184931 => 184932)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h        2015-05-28 00:34:39 UTC (rev 184931)
+++ trunk/Source/WebCore/rendering/RenderLayer.h        2015-05-28 00:39:35 UTC (rev 184932)
</span><span class="lines">@@ -702,7 +702,7 @@
</span><span class="cx"> 
</span><span class="cx">     // Non-auto z-index always implies stacking context here, because StyleResolver::adjustRenderStyle already adjusts z-index
</span><span class="cx">     // based on positioning and other criteria.
</span><del>-    bool isStackingContext(const RenderStyle* style) const { return !style-&gt;hasAutoZIndex() || isRootLayer(); }
</del><ins>+    bool isStackingContext(const RenderStyle* style) const { return !style-&gt;hasAutoZIndex() || isRootLayer() || m_forcedStackingContext; }
</ins><span class="cx"> 
</span><span class="cx">     bool isDirtyStackingContainer() const { return m_zOrderListsDirty &amp;&amp; isStackingContainer(); }
</span><span class="cx"> 
</span><span class="lines">@@ -991,6 +991,9 @@
</span><span class="cx"> private:
</span><span class="cx">     // The bitfields are up here so they will fall into the padding from ScrollableArea on 64-bit.
</span><span class="cx"> 
</span><ins>+    const bool m_isRootLayer : 1;
+    const bool m_forcedStackingContext : 1;
+
</ins><span class="cx">     // Keeps track of whether the layer is currently resizing, so events can cause resizing to start and stop.
</span><span class="cx">     bool m_inResizeMode : 1;
</span><span class="cx"> 
</span><span class="lines">@@ -1019,8 +1022,6 @@
</span><span class="cx">     // able to safely become a stacking context.
</span><span class="cx">     bool m_descendantsAreContiguousInStackingOrder : 1;
</span><span class="cx"> 
</span><del>-    const bool m_isRootLayer : 1;
-
</del><span class="cx">     bool m_usedTransparency : 1; // Tracks whether we need to close a transparent layer, i.e., whether
</span><span class="cx">                                  // we ended up painting this layer or any descendants (and therefore need to
</span><span class="cx">                                  // blend).
</span></span></pre>
</div>
</div>

</body>
</html>