<!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>[245212] 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/245212">245212</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2019-05-11 16:17:17 -0700 (Sat, 11 May 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Overflow scroll that becomes non-scrollable should stop being composited
https://bugs.webkit.org/show_bug.cgi?id=197817
<rdar://problem/50697290>

Reviewed by Antti Koivisto.

Source/WebCore:

Remove the iOS-specific #ifdef around code that triggers a compositing re-evaluation
when scrolling state changes.

Test: compositing/scrolling/async-overflow-scrolling/become-non-scrollable.html

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

LayoutTests:

Put in a compositing/scrolling/async-overflow-scrolling dir so we can enable it only
for platforms that have async overflow scrolling.

* TestExpectations:
* compositing/scrolling/async-overflow-scrolling/become-non-scrollable-expected.txt: Added.
* compositing/scrolling/async-overflow-scrolling/become-non-scrollable.html: Added.
* platform/ios-wk2/TestExpectations:
* platform/mac-wk2/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsTestExpectations">trunk/LayoutTests/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformioswk2TestExpectations">trunk/LayoutTests/platform/ios-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/</li>
<li><a href="#trunkLayoutTestscompositingscrollingasyncoverflowscrollingbecomenonscrollableexpectedtxt">trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-expected.txt</a></li>
<li><a href="#trunkLayoutTestscompositingscrollingasyncoverflowscrollingbecomenonscrollablehtml">trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (245211 => 245212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-05-11 23:14:03 UTC (rev 245211)
+++ trunk/LayoutTests/ChangeLog 2019-05-11 23:17:17 UTC (rev 245212)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2019-05-11  Simon Fraser  <simon.fraser@apple.com>
+
+        Overflow scroll that becomes non-scrollable should stop being composited
+        https://bugs.webkit.org/show_bug.cgi?id=197817
+        <rdar://problem/50697290>
+
+        Reviewed by Antti Koivisto.
+
+        Put in a compositing/scrolling/async-overflow-scrolling dir so we can enable it only
+        for platforms that have async overflow scrolling.
+
+        * TestExpectations:
+        * compositing/scrolling/async-overflow-scrolling/become-non-scrollable-expected.txt: Added.
+        * compositing/scrolling/async-overflow-scrolling/become-non-scrollable.html: Added.
+        * platform/ios-wk2/TestExpectations:
+        * platform/mac-wk2/TestExpectations:
+
</ins><span class="cx"> 2019-05-11  Alexey Proskuryakov  <ap@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cleaning up results for legacy-animation-engine tests
</span></span></pre></div>
<a id="trunkLayoutTestsTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/TestExpectations (245211 => 245212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/TestExpectations       2019-05-11 23:14:03 UTC (rev 245211)
+++ trunk/LayoutTests/TestExpectations  2019-05-11 23:17:17 UTC (rev 245212)
</span><span class="lines">@@ -61,6 +61,7 @@
</span><span class="cx"> 
</span><span class="cx"> # Requires async overflow scrolling
</span><span class="cx"> compositing/shared-backing/overflow-scroll [ Skip ]
</span><ins>+compositing/scrolling/async-overflow-scrolling [ Skip ]
</ins><span class="cx"> 
</span><span class="cx"> # WebKit2 only.
</span><span class="cx"> printing/printing-events.html [ Skip ]
</span></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingasyncoverflowscrollingbecomenonscrollableexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-expected.txt (0 => 245212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-expected.txt                              (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-expected.txt 2019-05-11 23:17:17 UTC (rev 245212)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+There should be no layers.
+
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingasyncoverflowscrollingbecomenonscrollablehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable.html (0 => 245212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable.html                              (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable.html 2019-05-11 23:17:17 UTC (rev 245212)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+<head>
+    <title>Tests an overflow scroll stops compositing if its content shrinks</title>
+    <style>
+        .scrollable {
+            overflow-y: scroll;
+            height: 300px;
+            width: 300px;
+            margin: 10px;
+            border: 1px solid black;
+        }
+    
+        .contents {
+            height: 500px;
+            width: 20px;
+            background-color: silver;
+        }
+        
+        .contents.changed {
+            height: 100px;
+        }
+    </style>
+    <script>
+        if (window.testRunner) {
+            testRunner.dumpAsText();
+            testRunner.waitUntilDone();
+        }
+
+        window.addEventListener('load', () => {
+            setTimeout(() => {
+                document.querySelector('.contents').classList.add('changed');
+
+                if (window.internals)
+                    document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
+
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            }, 0);
+        }, false);
+    </script>
+</head>
+<body>
+    <div class="scrollable">
+        <div class="contents"></div>
+    </div>
+<p>There should be no layers.</p>
+<pre id="layers"></pre>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformioswk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (245211 => 245212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-wk2/TestExpectations      2019-05-11 23:14:03 UTC (rev 245211)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations 2019-05-11 23:17:17 UTC (rev 245212)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx"> 
</span><span class="cx"> compositing/ios [ Pass ]
</span><span class="cx"> compositing/shared-backing/overflow-scroll [ Pass ]
</span><ins>+compositing/scrolling/async-overflow-scrolling [ Pass ]
</ins><span class="cx"> fast/device-orientation [ Pass ]
</span><span class="cx"> fast/history/ios [ Pass ]
</span><span class="cx"> fast/scrolling/ios [ Pass ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (245211 => 245212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations      2019-05-11 23:14:03 UTC (rev 245211)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2019-05-11 23:17:17 UTC (rev 245212)
</span><span class="lines">@@ -6,6 +6,7 @@
</span><span class="cx"> #//////////////////////////////////////////////////////////////////////////////////////////
</span><span class="cx"> 
</span><span class="cx"> compositing/shared-backing/overflow-scroll [ Pass ]
</span><ins>+compositing/scrolling/async-overflow-scrolling [ Pass ]
</ins><span class="cx"> editing/find [ Pass ]
</span><span class="cx"> editing/undo-manager [ Pass ]
</span><span class="cx"> fast/forms/select/mac-wk2 [ Pass ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (245211 => 245212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-05-11 23:14:03 UTC (rev 245211)
+++ trunk/Source/WebCore/ChangeLog      2019-05-11 23:17:17 UTC (rev 245212)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2019-05-11  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><ins>+        Overflow scroll that becomes non-scrollable should stop being composited
+        https://bugs.webkit.org/show_bug.cgi?id=197817
+        <rdar://problem/50697290>
+
+        Reviewed by Antti Koivisto.
+
+        Remove the iOS-specific #ifdef around code that triggers a compositing re-evaluation
+        when scrolling state changes.
+
+        Test: compositing/scrolling/async-overflow-scrolling/become-non-scrollable.html
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateScrollInfoAfterLayout):
+
+2019-05-11  Simon Fraser  <simon.fraser@apple.com>
+
</ins><span class="cx">         Layer bounds are incorrect for sharing layers that paint with transforms
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=197768
</span><span class="cx">         <rdar://problem/50695493>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (245211 => 245212)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp   2019-05-11 23:14:03 UTC (rev 245211)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp      2019-05-11 23:17:17 UTC (rev 245212)
</span><span class="lines">@@ -3709,10 +3709,8 @@
</span><span class="cx">         setNeedsCompositingConfigurationUpdate();
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY)
</del><span class="cx">     if (canUseCompositedScrolling())
</span><span class="cx">         setNeedsPostLayoutCompositingUpdate();
</span><del>-#endif
</del><span class="cx"> 
</span><span class="cx">     updateScrollSnapState();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>