<!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>[245570] 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/245570">245570</a></dd>
<dt>Author</dt> <dd>kocsen_chung@apple.com</dd>
<dt>Date</dt> <dd>2019-05-21 10:29:54 -0700 (Tue, 21 May 2019)</dd>
</dl>

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

    Translucent gradient rendering bug due to will-change transform
    https://bugs.webkit.org/show_bug.cgi?id=197654
    <rdar://problem/50547664>

    Reviewed by Dean Jackson.
    Source/WebCore:

    We failed to re-evaluate 'contentsOpaque' when a background changed, because this
    happened in updateGeometry() and that doesn't run for background changes.

    However, 'contentsOpaque' also requires knowing about geometry because we have to
    turn it off when there's subpixel positioning, and updateConfiguration()
    runs before updateGeometry().

    So compute m_hasSubpixelRounding in updateGeometry() and set contentsOpaque in
    updateAfterDescendants().

    Test: compositing/contents-opaque/background-change-to-transparent.html

    * rendering/RenderLayerBacking.cpp:
    (WebCore::RenderLayerBacking::updateConfiguration):
    (WebCore::RenderLayerBacking::updateGeometry):
    (WebCore::RenderLayerBacking::updateAfterDescendants):
    * rendering/RenderLayerBacking.h:

    LayoutTests:

    * compositing/contents-opaque/background-change-to-transparent-expected.txt: Added.
    * compositing/contents-opaque/background-change-to-transparent.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245207 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="#branchessafari60812420branchSourceWebCorerenderingRenderLayerBackingcpp">branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
<li><a href="#branchessafari60812420branchSourceWebCorerenderingRenderLayerBackingh">branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerBacking.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari60812420branchLayoutTestscompositingcontentsopaquebackgroundchangetotransparentexpectedtxt">branches/safari-608.1.24.20-branch/LayoutTests/compositing/contents-opaque/background-change-to-transparent-expected.txt</a></li>
<li><a href="#branchessafari60812420branchLayoutTestscompositingcontentsopaquebackgroundchangetotransparenthtml">branches/safari-608.1.24.20-branch/LayoutTests/compositing/contents-opaque/background-change-to-transparent.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 (245569 => 245570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/LayoutTests/ChangeLog 2019-05-21 17:07:57 UTC (rev 245569)
+++ branches/safari-608.1.24.20-branch/LayoutTests/ChangeLog    2019-05-21 17:29:54 UTC (rev 245570)
</span><span class="lines">@@ -1,3 +1,51 @@
</span><ins>+2019-05-21  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r245207. rdar://problem/50865946
+
+    Translucent gradient rendering bug due to will-change transform
+    https://bugs.webkit.org/show_bug.cgi?id=197654
+    <rdar://problem/50547664>
+    
+    Reviewed by Dean Jackson.
+    Source/WebCore:
+    
+    We failed to re-evaluate 'contentsOpaque' when a background changed, because this
+    happened in updateGeometry() and that doesn't run for background changes.
+    
+    However, 'contentsOpaque' also requires knowing about geometry because we have to
+    turn it off when there's subpixel positioning, and updateConfiguration()
+    runs before updateGeometry().
+    
+    So compute m_hasSubpixelRounding in updateGeometry() and set contentsOpaque in
+    updateAfterDescendants().
+    
+    Test: compositing/contents-opaque/background-change-to-transparent.html
+    
+    * rendering/RenderLayerBacking.cpp:
+    (WebCore::RenderLayerBacking::updateConfiguration):
+    (WebCore::RenderLayerBacking::updateGeometry):
+    (WebCore::RenderLayerBacking::updateAfterDescendants):
+    * rendering/RenderLayerBacking.h:
+    
+    LayoutTests:
+    
+    * compositing/contents-opaque/background-change-to-transparent-expected.txt: Added.
+    * compositing/contents-opaque/background-change-to-transparent.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245207 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-11  Simon Fraser  <simon.fraser@apple.com>
+
+            Translucent gradient rendering bug due to will-change transform
+            https://bugs.webkit.org/show_bug.cgi?id=197654
+            <rdar://problem/50547664>
+
+            Reviewed by Dean Jackson.
+
+            * compositing/contents-opaque/background-change-to-transparent-expected.txt: Added.
+            * compositing/contents-opaque/background-change-to-transparent.html: Added.
+
</ins><span class="cx"> 2019-05-20  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r245505. rdar://problem/50801608
</span></span></pre></div>
<a id="branchessafari60812420branchLayoutTestscompositingcontentsopaquebackgroundchangetotransparentexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-608.1.24.20-branch/LayoutTests/compositing/contents-opaque/background-change-to-transparent-expected.txt (0 => 245570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/LayoutTests/compositing/contents-opaque/background-change-to-transparent-expected.txt                         (rev 0)
+++ branches/safari-608.1.24.20-branch/LayoutTests/compositing/contents-opaque/background-change-to-transparent-expected.txt    2019-05-21 17:29:54 UTC (rev 245570)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+Text here
+(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 18.00 10.00)
+          (bounds 300.00 300.00)
+          (drawsContent 1)
+        )
+      )
+    )
+  )
+)
+
</ins></span></pre></div>
<a id="branchessafari60812420branchLayoutTestscompositingcontentsopaquebackgroundchangetotransparenthtml"></a>
<div class="addfile"><h4>Added: branches/safari-608.1.24.20-branch/LayoutTests/compositing/contents-opaque/background-change-to-transparent.html (0 => 245570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/LayoutTests/compositing/contents-opaque/background-change-to-transparent.html                         (rev 0)
+++ branches/safari-608.1.24.20-branch/LayoutTests/compositing/contents-opaque/background-change-to-transparent.html    2019-05-21 17:29:54 UTC (rev 245570)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+    <title>Tests that contentsOpaque is re-evaluated after a background style change</title>
+    <style>
+        .composited {
+            margin: 20px;
+            height: 300px;
+            width: 300px;
+            margin: 10px;
+            background-color: silver;
+            transform: translateZ(0);
+        }
+        
+        .composited.changed {
+            background: none;
+        }
+    </style>
+    <script>
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
+        }
+
+        window.addEventListener('load', () => {
+            setTimeout(() => {
+                document.querySelector('.composited').classList.add('changed');
+                if (window.internals)
+                    document.getElementById('layers').textContent = window.internals.layerTreeAsText(document);
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            }, 0);
+        }, false);
+    </script>
+</head>
+<body>
+    <div class="composited">Text here</div>
+<pre id="layers"></pre>
+</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 (245569 => 245570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog      2019-05-21 17:07:57 UTC (rev 245569)
+++ branches/safari-608.1.24.20-branch/Source/WebCore/ChangeLog 2019-05-21 17:29:54 UTC (rev 245570)
</span><span class="lines">@@ -1,3 +1,66 @@
</span><ins>+2019-05-21  Kocsen Chung  <kocsen_chung@apple.com>
+
+        Cherry-pick r245207. rdar://problem/50865946
+
+    Translucent gradient rendering bug due to will-change transform
+    https://bugs.webkit.org/show_bug.cgi?id=197654
+    <rdar://problem/50547664>
+    
+    Reviewed by Dean Jackson.
+    Source/WebCore:
+    
+    We failed to re-evaluate 'contentsOpaque' when a background changed, because this
+    happened in updateGeometry() and that doesn't run for background changes.
+    
+    However, 'contentsOpaque' also requires knowing about geometry because we have to
+    turn it off when there's subpixel positioning, and updateConfiguration()
+    runs before updateGeometry().
+    
+    So compute m_hasSubpixelRounding in updateGeometry() and set contentsOpaque in
+    updateAfterDescendants().
+    
+    Test: compositing/contents-opaque/background-change-to-transparent.html
+    
+    * rendering/RenderLayerBacking.cpp:
+    (WebCore::RenderLayerBacking::updateConfiguration):
+    (WebCore::RenderLayerBacking::updateGeometry):
+    (WebCore::RenderLayerBacking::updateAfterDescendants):
+    * rendering/RenderLayerBacking.h:
+    
+    LayoutTests:
+    
+    * compositing/contents-opaque/background-change-to-transparent-expected.txt: Added.
+    * compositing/contents-opaque/background-change-to-transparent.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245207 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-11  Simon Fraser  <simon.fraser@apple.com>
+
+            Translucent gradient rendering bug due to will-change transform
+            https://bugs.webkit.org/show_bug.cgi?id=197654
+            <rdar://problem/50547664>
+
+            Reviewed by Dean Jackson.
+
+            We failed to re-evaluate 'contentsOpaque' when a background changed, because this
+            happened in updateGeometry() and that doesn't run for background changes.
+
+            However, 'contentsOpaque' also requires knowing about geometry because we have to
+            turn it off when there's subpixel positioning, and updateConfiguration()
+            runs before updateGeometry().
+
+            So compute m_hasSubpixelRounding in updateGeometry() and set contentsOpaque in
+            updateAfterDescendants().
+
+            Test: compositing/contents-opaque/background-change-to-transparent.html
+
+            * rendering/RenderLayerBacking.cpp:
+            (WebCore::RenderLayerBacking::updateConfiguration):
+            (WebCore::RenderLayerBacking::updateGeometry):
+            (WebCore::RenderLayerBacking::updateAfterDescendants):
+            * rendering/RenderLayerBacking.h:
+
</ins><span class="cx"> 2019-05-20  Kocsen Chung  <kocsen_chung@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r245539. rdar://problem/48740417
</span></span></pre></div>
<a id="branchessafari60812420branchSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (245569 => 245570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerBacking.cpp       2019-05-21 17:07:57 UTC (rev 245569)
+++ branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerBacking.cpp  2019-05-21 17:29:54 UTC (rev 245570)
</span><span class="lines">@@ -813,7 +813,7 @@
</span><span class="cx">         updateRootLayerConfiguration();
</span><span class="cx"> 
</span><span class="cx">     updateEventRegion();
</span><del>-    
</del><ins>+
</ins><span class="cx">     // Requires layout.
</span><span class="cx">     if (contentsInfo.isDirectlyCompositedImage())
</span><span class="cx">         updateImageContents(contentsInfo);
</span><span class="lines">@@ -1106,6 +1106,7 @@
</span><span class="cx">     LayoutSize oldSubpixelOffsetFromRenderer = m_subpixelOffsetFromRenderer;
</span><span class="cx">     primaryGraphicsLayerOffsetFromRenderer = computeOffsetFromRenderer(-rendererOffset.fromPrimaryGraphicsLayer(), deviceScaleFactor());
</span><span class="cx">     m_subpixelOffsetFromRenderer = primaryGraphicsLayerOffsetFromRenderer.m_subpixelOffset;
</span><ins>+    m_hasSubpixelRounding = !m_subpixelOffsetFromRenderer.isZero() || compositedBounds().size() != primaryGraphicsLayerRect.size();
</ins><span class="cx"> 
</span><span class="cx">     if (primaryGraphicsLayerOffsetFromRenderer.m_devicePixelOffset != m_graphicsLayer->offsetFromRenderer()) {
</span><span class="cx">         m_graphicsLayer->setOffsetFromRenderer(primaryGraphicsLayerOffsetFromRenderer.m_devicePixelOffset);
</span><span class="lines">@@ -1112,14 +1113,6 @@
</span><span class="cx">         positionOverflowControlsLayers();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (!m_isMainFrameRenderViewLayer && !m_isFrameLayerWithTiledBacking && !m_requiresBackgroundLayer) {
-        // For non-root layers, background is always painted by the primary graphics layer.
-        ASSERT(!m_backgroundLayer);
-        // Subpixel offset from graphics layer or size changed.
-        bool hadSubpixelRounding = !m_subpixelOffsetFromRenderer.isZero() || compositedBounds().size() != primaryGraphicsLayerRect.size();
-        m_graphicsLayer->setContentsOpaque(!hadSubpixelRounding && m_owningLayer.backgroundIsKnownToBeOpaqueInRect(compositedBounds()));
-    }
-
</del><span class="cx">     // If we have a layer that clips children, position it.
</span><span class="cx">     LayoutRect clippingBox;
</span><span class="cx">     if (auto* clipLayer = clippingLayer()) {
</span><span class="lines">@@ -1320,6 +1313,12 @@
</span><span class="cx"> 
</span><span class="cx">     updateDrawsContent(contentsInfo);
</span><span class="cx"> 
</span><ins>+    if (!m_isMainFrameRenderViewLayer && !m_isFrameLayerWithTiledBacking && !m_requiresBackgroundLayer) {
+        // For non-root layers, background is always painted by the primary graphics layer.
+        ASSERT(!m_backgroundLayer);
+        m_graphicsLayer->setContentsOpaque(!m_hasSubpixelRounding && m_owningLayer.backgroundIsKnownToBeOpaqueInRect(compositedBounds()));
+    }
+
</ins><span class="cx">     m_graphicsLayer->setContentsVisible(m_owningLayer.hasVisibleContent() || hasVisibleNonCompositedDescendants());
</span><span class="cx">     if (m_scrollContainerLayer) {
</span><span class="cx">         m_scrollContainerLayer->setContentsVisible(renderer().style().visibility() == Visibility::Visible);
</span></span></pre></div>
<a id="branchessafari60812420branchSourceWebCorerenderingRenderLayerBackingh"></a>
<div class="modfile"><h4>Modified: branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerBacking.h (245569 => 245570)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerBacking.h 2019-05-21 17:07:57 UTC (rev 245569)
+++ branches/safari-608.1.24.20-branch/Source/WebCore/rendering/RenderLayerBacking.h    2019-05-21 17:29:54 UTC (rev 245570)
</span><span class="lines">@@ -434,6 +434,7 @@
</span><span class="cx"> #endif
</span><span class="cx">     bool m_backgroundLayerPaintsFixedRootBackground { false };
</span><span class="cx">     bool m_requiresBackgroundLayer { false };
</span><ins>+    bool m_hasSubpixelRounding { false };
</ins><span class="cx">     bool m_paintsSubpixelAntialiasedText { false }; // This is for logging only.
</span><span class="cx"> };
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>