<!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>[245581] branches/safari-608.1.24.20-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/245581">245581</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2019-05-21 10:30:33 -0700 (Tue, 21 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/245471">r245471</a>. rdar://problem/50865946

    REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/245170">r245170</a>): gmail.com header flickers when hovering over the animating buttons
    https://bugs.webkit.org/show_bug.cgi?id=197975
    <rdar://problem/50865946>

    Reviewed by Antti Koivisto.

    Source/WebCore:

    When computeCompositingRequirements() determined that a layer could paint into shared backing, it
    pushed an overlap container. If that layer then converted to normal composting, we'd push a second
    overlap container, which left the overlap map in a bad state for the rest of the compositing
    traversal, causing layers to not get composited when necessary.

    Test: compositing/shared-backing/overlap-after-shared-to-composited.html

    * rendering/RenderLayerCompositor.cpp:
    (WebCore::RenderLayerCompositor::computeCompositingRequirements):

    LayoutTests:

    * compositing/shared-backing/overlap-after-shared-to-composited-expected.html: Added.
    * compositing/shared-backing/overlap-after-shared-to-composited.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245471 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari60812420branchLayoutTestsChangeLog">branches/safari-608.1.24.20-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari60812420branchSourceWebCoreChangeLog">branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari60812420branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari60812420branchLayoutTestscompositingsharedbackingoverlapaftersharedtocompositedexpectedhtml">branches/safari-608.1.24.20-branch/LayoutTests/compositing/shared-backing/overlap-after-shared-to-composited-expected.html</a></li>
<li><a href="#branchessafari60812420branchLayoutTestscompositingsharedbackingoverlapaftersharedtocompositedhtml">branches/safari-608.1.24.20-branch/LayoutTests/compositing/shared-backing/overlap-after-shared-to-composited.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari60812420branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24.20-branch/LayoutTests/ChangeLog (245580 => 245581)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/LayoutTests/ChangeLog 2019-05-21 17:30:30 UTC (rev 245580)
+++ branches/safari-608.1.24.20-branch/LayoutTests/ChangeLog    2019-05-21 17:30:33 UTC (rev 245581)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2019-05-21  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r245471. rdar://problem/50865946
+
+    REGRESSION (r245170): gmail.com header flickers when hovering over the animating buttons
+    https://bugs.webkit.org/show_bug.cgi?id=197975
+    <rdar://problem/50865946>
+    
+    Reviewed by Antti Koivisto.
+    
+    Source/WebCore:
+    
+    When computeCompositingRequirements() determined that a layer could paint into shared backing, it
+    pushed an overlap container. If that layer then converted to normal composting, we'd push a second
+    overlap container, which left the overlap map in a bad state for the rest of the compositing
+    traversal, causing layers to not get composited when necessary.
+    
+    Test: compositing/shared-backing/overlap-after-shared-to-composited.html
+    
+    * rendering/RenderLayerCompositor.cpp:
+    (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+    
+    LayoutTests:
+    
+    * compositing/shared-backing/overlap-after-shared-to-composited-expected.html: Added.
+    * compositing/shared-backing/overlap-after-shared-to-composited.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245471 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-17  Simon Fraser  <simon.fraser@apple.com>
+
+            REGRESSION (r245170): gmail.com header flickers when hovering over the animating buttons
+            https://bugs.webkit.org/show_bug.cgi?id=197975
+            <rdar://problem/50865946>
+
+            Reviewed by Antti Koivisto.
+
+            * compositing/shared-backing/overlap-after-shared-to-composited-expected.html: Added.
+            * compositing/shared-backing/overlap-after-shared-to-composited.html: Added.
+
+2019-05-21  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r245221. rdar://problem/50865946
</span><span class="cx"> 
</span><span class="cx">     REGRESSION (r245208): compositing/shared-backing/sharing-bounds-non-clipping-shared-layer.html asserts
</span></span></pre></div>
<a id="branchessafari60812420branchLayoutTestscompositingsharedbackingoverlapaftersharedtocompositedexpectedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-608.1.24.20-branch/LayoutTests/compositing/shared-backing/overlap-after-shared-to-composited-expected.html (0 => 245581)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/LayoutTests/compositing/shared-backing/overlap-after-shared-to-composited-expected.html                               (rev 0)
+++ branches/safari-608.1.24.20-branch/LayoutTests/compositing/shared-backing/overlap-after-shared-to-composited-expected.html  2019-05-21 17:30:33 UTC (rev 245581)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+    <title>Tests that overlap testing continues to work after a layer converts from shared to composited</title>
+    <style>
+        .trigger {
+            position: absolute;
+            transform: translateZ(0);
+            background-color: silver;
+            width: 20px;
+            height: 400px;
+        }
+        
+        .provider {
+            position: absolute;
+            left: 20px;
+            top: 20px;
+            width: 400px;
+            height: 100px;
+            background-color: gray;
+        }
+
+        .box {
+            width: 100px;
+            height: 100px;
+            background-color: gray;
+        }
+        
+        .absolute {
+            position: absolute;
+            top: 200px;
+            left: 0px;
+            background-color: lightblue;
+        }
+        
+        .overlapper {
+            position: absolute;
+            top: 70px;
+            left: 150px;
+            width: 200px;
+            height: 100px;
+            padding: 10px;
+            background-color: green;
+        }
+        
+        .stacking {
+            position: relative;
+            z-index: 0;
+            padding: 10px;
+            height: 120px;
+            border: 1px solid black;
+            transform: translateZ(0);
+        }
+        
+        .negative {
+            position: relative;
+            z-index: -1;
+            background-color: orange;
+            transform: translateZ(0);
+        }
+    </style>
+</head>
+<body>
+    <div class="trigger"></div>
+    <div class="provider">
+        <div class="absolute box"></div>
+        <div class="stacking box">
+            <div class="negative box"></div>
+        </div>
+    </div>
+    <div class="overlapper"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari60812420branchLayoutTestscompositingsharedbackingoverlapaftersharedtocompositedhtml"></a>
<div class="addfile"><h4>Added: branches/safari-608.1.24.20-branch/LayoutTests/compositing/shared-backing/overlap-after-shared-to-composited.html (0 => 245581)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/LayoutTests/compositing/shared-backing/overlap-after-shared-to-composited.html                                (rev 0)
+++ branches/safari-608.1.24.20-branch/LayoutTests/compositing/shared-backing/overlap-after-shared-to-composited.html   2019-05-21 17:30:33 UTC (rev 245581)
</span><span class="lines">@@ -0,0 +1,88 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+    <title>Tests that overlap testing continues to work after a layer converts from shared to composited</title>
+    <style>
+        .trigger {
+            position: absolute;
+            transform: translateZ(0);
+            background-color: silver;
+            width: 20px;
+            height: 400px;
+        }
+        
+        .provider {
+            position: absolute;
+            left: 20px;
+            top: 20px;
+            width: 400px;
+            height: 100px;
+            background-color: gray;
+        }
+
+        .box {
+            width: 100px;
+            height: 100px;
+            background-color: gray;
+        }
+        
+        .absolute {
+            position: absolute;
+            top: 200px;
+            left: 0px;
+            background-color: lightblue;
+        }
+        
+        .overlapper {
+            position: absolute;
+            top: 70px;
+            left: 150px;
+            width: 200px;
+            height: 100px;
+            padding: 10px;
+            background-color: green;
+        }
+        
+        .stacking {
+            position: relative;
+            z-index: 0;
+            padding: 10px;
+            height: 120px;
+            border: 1px solid black;
+        }
+        
+        .negative {
+            position: relative;
+            z-index: -1;
+            background-color: orange;
+        }
+        
+        .negative.changed {
+            transform: translateZ(0);
+        }
+        
+    </style>
+    <script>
+        if (window.testRunner)
+            testRunner.waitUntilDone();
+        
+        window.addEventListener('load', () => {
+            setTimeout(() => {
+                document.querySelector('.negative').classList.add('changed');
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            }, 0);
+        }, false);
+    </script>
+</head>
+<body>
+    <div class="trigger"></div>
+    <div class="provider">
+        <div class="absolute box"></div>
+        <div class="stacking box">
+            <div class="negative box"></div>
+        </div>
+    </div>
+    <div class="overlapper"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari60812420branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog (245580 => 245581)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog      2019-05-21 17:30:30 UTC (rev 245580)
+++ branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog 2019-05-21 17:30:33 UTC (rev 245581)
</span><span class="lines">@@ -1,5 +1,52 @@
</span><span class="cx"> 2019-05-21  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><ins>+        Cherry-pick r245471. rdar://problem/50865946
+
+    REGRESSION (r245170): gmail.com header flickers when hovering over the animating buttons
+    https://bugs.webkit.org/show_bug.cgi?id=197975
+    <rdar://problem/50865946>
+    
+    Reviewed by Antti Koivisto.
+    
+    Source/WebCore:
+    
+    When computeCompositingRequirements() determined that a layer could paint into shared backing, it
+    pushed an overlap container. If that layer then converted to normal composting, we'd push a second
+    overlap container, which left the overlap map in a bad state for the rest of the compositing
+    traversal, causing layers to not get composited when necessary.
+    
+    Test: compositing/shared-backing/overlap-after-shared-to-composited.html
+    
+    * rendering/RenderLayerCompositor.cpp:
+    (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+    
+    LayoutTests:
+    
+    * compositing/shared-backing/overlap-after-shared-to-composited-expected.html: Added.
+    * compositing/shared-backing/overlap-after-shared-to-composited.html: Added.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245471 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-17  Simon Fraser  <simon.fraser@apple.com>
+
+            REGRESSION (r245170): gmail.com header flickers when hovering over the animating buttons
+            https://bugs.webkit.org/show_bug.cgi?id=197975
+            <rdar://problem/50865946>
+
+            Reviewed by Antti Koivisto.
+
+            When computeCompositingRequirements() determined that a layer could paint into shared backing, it
+            pushed an overlap container. If that layer then converted to normal composting, we'd push a second
+            overlap container, which left the overlap map in a bad state for the rest of the compositing
+            traversal, causing layers to not get composited when necessary.
+
+            Test: compositing/shared-backing/overlap-after-shared-to-composited.html
+
+            * rendering/RenderLayerCompositor.cpp:
+            (WebCore::RenderLayerCompositor::computeCompositingRequirements):
+
+2019-05-21  Kocsen Chung  <kocsen_chung@apple.com>
+
</ins><span class="cx">         Cherry-pick r245375. rdar://problem/50865946
</span><span class="cx"> 
</span><span class="cx">     Avoid a recursive descendants layer walk sometimes
</span></span></pre></div>
<a id="branchessafari60812420branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (245580 => 245581)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp    2019-05-21 17:30:30 UTC (rev 245580)
+++ branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp       2019-05-21 17:30:33 UTC (rev 245581)
</span><span class="lines">@@ -910,8 +910,10 @@
</span><span class="cx">         layer.setIndirectCompositingReason(compositingReason);
</span><span class="cx"> 
</span><span class="cx">     // Check if the computed indirect reason will force the layer to become composited.
</span><del>-    if (!willBeComposited && layer.mustCompositeForIndirectReasons() && canBeComposited(layer))
</del><ins>+    if (!willBeComposited && layer.mustCompositeForIndirectReasons() && canBeComposited(layer)) {
</ins><span class="cx">         willBeComposited = true;
</span><ins>+        layerPaintsIntoProvidedBacking = false;
+    }
</ins><span class="cx"> 
</span><span class="cx">     // The children of this layer don't need to composite, unless there is
</span><span class="cx">     // a compositing layer among them, so start by inheriting the compositing
</span><span class="lines">@@ -924,8 +926,11 @@
</span><span class="cx">         currentState.testingOverlap = true;
</span><span class="cx">         // This layer now acts as the ancestor for kids.
</span><span class="cx">         currentState.compositingAncestor = &layer;
</span><del>-        overlapMap.pushCompositingContainer();
-        LOG_WITH_STREAM(CompositingOverlap, stream << "layer " << &layer << " will composite, pushed container " << overlapMap);
</del><ins>+        
+        if (!layerPaintsIntoProvidedBacking) {
+            overlapMap.pushCompositingContainer();
+            LOG_WITH_STREAM(CompositingOverlap, stream << "layer " << &layer << " will composite, pushed container " << overlapMap);
+        }
</ins><span class="cx"> 
</span><span class="cx">         willBeComposited = true;
</span><span class="cx">         layerPaintsIntoProvidedBacking = false;
</span></span></pre>
</div>
</div>

</body>
</html>