<!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>[247142] 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/247142">247142</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2019-07-04 07:53:40 -0700 (Thu, 04 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Some layers inside overflow:scroll don't move back to correct positions when the contents are shrunk
https://bugs.webkit.org/show_bug.cgi?id=199464
rdar://problem/52613285

Reviewed by Sam Weinig.
Source/WebCore:

When an overflow scroller's content shrink and it becomes non-scrollable, the 'boundsOrigin' in
the ancestor clipping stacks of related layers wouldn't get reset to zero, leaving layers in
the wrong place, so always set boundsOrigin to zero on the clipping layers of non-overflow entries
in the ancestor clipping stack.

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

* rendering/RenderLayerBacking.cpp:
(WebCore::RenderLayerBacking::updateGeometry):

LayoutTests:

* compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child-expected.html: Added.
* compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child.html: 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="#trunkSourceWebCorerenderingRenderLayerBackingcpp">trunk/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestscompositingscrollingasyncoverflowscrollingbecomenonscrollablewithchildexpectedhtml">trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child-expected.html</a></li>
<li><a href="#trunkLayoutTestscompositingscrollingasyncoverflowscrollingbecomenonscrollablewithchildhtml">trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (247141 => 247142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-07-04 13:54:50 UTC (rev 247141)
+++ trunk/LayoutTests/ChangeLog 2019-07-04 14:53:40 UTC (rev 247142)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2019-07-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Some layers inside overflow:scroll don't move back to correct positions when the contents are shrunk
+        https://bugs.webkit.org/show_bug.cgi?id=199464
+        rdar://problem/52613285
+
+        Reviewed by Sam Weinig.
+
+        * compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child-expected.html: Added.
+        * compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child.html: Added.
+
</ins><span class="cx"> 2019-07-03  Justin Fan  <justin_fan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [WHLSL] Support float4x4 in test harness
</span></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingasyncoverflowscrollingbecomenonscrollablewithchildexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child-expected.html (0 => 247142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child-expected.html                          (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child-expected.html     2019-07-04 14:53:40 UTC (rev 247142)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+<head>
+    <style>
+        #scroller {
+            overflow: scroll;
+            height: 400px;
+            width: 400px;
+            border: 1px solid black;
+        }
+
+        .composited {
+            width: 200px;
+            height: 200px;
+            background-color: green;
+            transform: translateZ(0);
+        }
+
+        .content {
+            height: 100px;
+        }
+    </style>
+</head>
+<body>
+    <section id="scroller">
+        <div class="composited"></div>
+        <div class="content"></div>
+    </section>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkLayoutTestscompositingscrollingasyncoverflowscrollingbecomenonscrollablewithchildhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child.html (0 => 247142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child.html                           (rev 0)
+++ trunk/LayoutTests/compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child.html      2019-07-04 14:53:40 UTC (rev 247142)
</span><span class="lines">@@ -0,0 +1,48 @@
</span><ins>+<!DOCTYPE html> <!-- webkit-test-runner [ internal:AsyncOverflowScrollingEnabled=true ] -->
+<html>
+<head>
+    <style>
+        #scroller {
+            overflow: scroll;
+            height: 400px;
+            width: 400px;
+            border: 1px solid black;
+        }
+
+        .composited {
+            width: 200px;
+            height: 200px;
+            background-color: green;
+            transform: translateZ(0);
+        }
+
+        .content {
+            height: 700px;
+        }
+        
+        .content.changed {
+            height: 100px;
+        }
+    </style>
+    <script>
+        if (window.testRunner)
+            testRunner.waitUntilDone();
+
+        window.addEventListener('load', () => {
+            scroller.scrollTo(0, 100);
+            setTimeout(() => {
+                document.querySelector('.content').classList.add('changed');
+                if (window.testRunner)
+                    testRunner.notifyDone();
+            }, 0);
+        }, false);
+    </script>
+</head>
+<body>
+    <section id="scroller">
+        <div class="composited"></div>
+        <div class="content"></div>
+    </section>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (247141 => 247142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-07-04 13:54:50 UTC (rev 247141)
+++ trunk/Source/WebCore/ChangeLog      2019-07-04 14:53:40 UTC (rev 247142)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2019-07-03  Simon Fraser  <simon.fraser@apple.com>
+
+        Some layers inside overflow:scroll don't move back to correct positions when the contents are shrunk
+        https://bugs.webkit.org/show_bug.cgi?id=199464
+        rdar://problem/52613285
+
+        Reviewed by Sam Weinig.
+        
+        When an overflow scroller's content shrink and it becomes non-scrollable, the 'boundsOrigin' in
+        the ancestor clipping stacks of related layers wouldn't get reset to zero, leaving layers in
+        the wrong place, so always set boundsOrigin to zero on the clipping layers of non-overflow entries
+        in the ancestor clipping stack.
+
+        Test: compositing/scrolling/async-overflow-scrolling/become-non-scrollable-with-child.html
+
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::RenderLayerBacking::updateGeometry):
+
</ins><span class="cx"> 2019-07-04  Konstantin Tokarev  <annulen@yandex.ru>
</span><span class="cx"> 
</span><span class="cx">         HyphenationLibHyphen: Include GLib-related headers only for PLATFORM(GTK)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (247141 => 247142)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp    2019-07-04 13:54:50 UTC (rev 247141)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp       2019-07-04 14:53:40 UTC (rev 247142)
</span><span class="lines">@@ -1109,7 +1109,8 @@
</span><span class="cx"> 
</span><span class="cx">                 entry.clippingLayer->setBoundsOrigin(scrollOffset);
</span><span class="cx">                 lastClipLayerRect.moveBy(-scrollOffset);
</span><del>-            }
</del><ins>+            } else
+                entry.clippingLayer->setBoundsOrigin({ });
</ins><span class="cx">         }
</span><span class="cx"> 
</span><span class="cx">         parentGraphicsLayerRect = lastClipLayerRect;
</span></span></pre>
</div>
</div>

</body>
</html>