<!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>[278429] 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/278429">278429</a></dd>
<dt>Author</dt> <dd>clord@igalia.com</dd>
<dt>Date</dt> <dd>2021-06-03 16:39:32 -0700 (Thu, 03 Jun 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WPE] position:sticky content is not correctly offset on async scrolled overflow layers with an RTL vertical scrollbar
https://bugs.webkit.org/show_bug.cgi?id=226327

Reviewed by Darin Adler.

Source/WebCore:

Make sure to respect the origin of sticky positioning nodes'
constraining rect.

No new tests, covered by existing tests.

* page/scrolling/cocoa/ScrollingTreeStickyNode.mm:
(WebCore::ScrollingTreeStickyNode::computeLayerPosition const):
* page/scrolling/nicosia/ScrollingTreeStickyNode.cpp:
(WebCore::ScrollingTreeStickyNode::computeLayerPosition const):

LayoutTests:

Some sticky-positioning RTL related tests now pass.

* platform/wpe/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformwpeTestExpectations">trunk/LayoutTests/platform/wpe/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagescrollingcocoaScrollingTreeStickyNodemm">trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm</a></li>
<li><a href="#trunkSourceWebCorepagescrollingnicosiaScrollingTreeStickyNodecpp">trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (278428 => 278429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-06-03 23:37:25 UTC (rev 278428)
+++ trunk/LayoutTests/ChangeLog 2021-06-03 23:39:32 UTC (rev 278429)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-06-03  Chris Lord  <clord@igalia.com>
+
+        [WPE] position:sticky content is not correctly offset on async scrolled overflow layers with an RTL vertical scrollbar
+        https://bugs.webkit.org/show_bug.cgi?id=226327
+
+        Reviewed by Darin Adler.
+
+        Some sticky-positioning RTL related tests now pass.
+
+        * platform/wpe/TestExpectations:
+
</ins><span class="cx"> 2021-06-03  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (Safari 14): Menu items jump around on codelearn.cat
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwpeTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/wpe/TestExpectations (278428 => 278429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/wpe/TestExpectations  2021-06-03 23:37:25 UTC (rev 278428)
+++ trunk/LayoutTests/platform/wpe/TestExpectations     2021-06-03 23:39:32 UTC (rev 278429)
</span><span class="lines">@@ -716,8 +716,6 @@
</span><span class="cx"> webkit.org/b/224596 css3/filters/clipping-overflow-scroll-with-pixel-moving-effect-on.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/224596 fast/scrolling/rtl-scrollbars-overflow-dir-rtl.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/224596 fast/scrolling/rtl-scrollbars-overflow-padding.html [ ImageOnlyFailure ]
</span><del>-webkit.org/b/224596 fast/scrolling/rtl-scrollbars-sticky-overflow-scroll-2.html [ ImageOnlyFailure ]
-webkit.org/b/224596 fast/scrolling/rtl-scrollbars-sticky-overflow-scroll.html [ ImageOnlyFailure ]
</del><span class="cx"> webkit.org/b/224596 imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-lr-001.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/224596 imported/w3c/web-platform-tests/css/css-grid/grid-model/grid-container-scrollbar-vertical-rl-001.html [ ImageOnlyFailure ]
</span><span class="cx"> webkit.org/b/224596 imported/w3c/web-platform-tests/css/css-position/hypothetical-box-scroll-parent.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (278428 => 278429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-06-03 23:37:25 UTC (rev 278428)
+++ trunk/Source/WebCore/ChangeLog      2021-06-03 23:39:32 UTC (rev 278429)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-06-03  Chris Lord  <clord@igalia.com>
+
+        [WPE] position:sticky content is not correctly offset on async scrolled overflow layers with an RTL vertical scrollbar
+        https://bugs.webkit.org/show_bug.cgi?id=226327
+
+        Reviewed by Darin Adler.
+
+        Make sure to respect the origin of sticky positioning nodes'
+        constraining rect.
+
+        No new tests, covered by existing tests.
+
+        * page/scrolling/cocoa/ScrollingTreeStickyNode.mm:
+        (WebCore::ScrollingTreeStickyNode::computeLayerPosition const):
+        * page/scrolling/nicosia/ScrollingTreeStickyNode.cpp:
+        (WebCore::ScrollingTreeStickyNode::computeLayerPosition const):
+
</ins><span class="cx"> 2021-06-03  Simon Fraser  <simon.fraser@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (Safari 14): Menu items jump around on codelearn.cat
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingcocoaScrollingTreeStickyNodemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm (278428 => 278429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm     2021-06-03 23:37:25 UTC (rev 278428)
+++ trunk/Source/WebCore/page/scrolling/cocoa/ScrollingTreeStickyNode.mm        2021-06-03 23:39:32 UTC (rev 278429)
</span><span class="lines">@@ -76,7 +76,8 @@
</span><span class="cx">             constrainingRect = frameScrollingNode.layoutViewport();
</span><span class="cx">         } else {
</span><span class="cx">             auto& overflowScrollingNode = downcast<ScrollingTreeOverflowScrollingNode>(scrollingNode);
</span><del>-            constrainingRect = FloatRect(overflowScrollingNode.currentScrollOffset(), m_constraints.constrainingRectAtLastLayout().size());
</del><ins>+            constrainingRect = m_constraints.constrainingRectAtLastLayout();
+            constrainingRect.move(overflowScrollingNode.scrollDeltaSinceLastCommit());
</ins><span class="cx">         }
</span><span class="cx">         return m_constraints.layerPositionForConstrainingRect(constrainingRect);
</span><span class="cx">     };
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingnicosiaScrollingTreeStickyNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.cpp (278428 => 278429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.cpp  2021-06-03 23:37:25 UTC (rev 278428)
+++ trunk/Source/WebCore/page/scrolling/nicosia/ScrollingTreeStickyNode.cpp     2021-06-03 23:39:32 UTC (rev 278429)
</span><span class="lines">@@ -118,7 +118,8 @@
</span><span class="cx">             constrainingRect = frameScrollingNode.layoutViewport();
</span><span class="cx">         } else {
</span><span class="cx">             auto& overflowScrollingNode = downcast<ScrollingTreeOverflowScrollingNode>(scrollingNode);
</span><del>-            constrainingRect = FloatRect(overflowScrollingNode.currentScrollOffset(), m_constraints.constrainingRectAtLastLayout().size());
</del><ins>+            constrainingRect = m_constraints.constrainingRectAtLastLayout();
+            constrainingRect.move(overflowScrollingNode.scrollDeltaSinceLastCommit());
</ins><span class="cx">         }
</span><span class="cx">         return m_constraints.layerPositionForConstrainingRect(constrainingRect);
</span><span class="cx">     };
</span></span></pre>
</div>
</div>

</body>
</html>