<!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>[279869] 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/279869">279869</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-07-13 01:17:26 -0700 (Tue, 13 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>RenderLayerScrollableArea::updateScrollPosition assumes that it can scroll to the targeted scroll position
https://bugs.webkit.org/show_bug.cgi?id=227803

Patch by Martin Robinson <mrobinson@igalia.com> on 2021-07-13
Reviewed by Simon Fraser.

LayoutTests/imported/w3c:

* web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps-expected.txt: Update test result to reflect newly passing test.

Source/WebCore:

No new tests. This is covered by an existing WPT test:
  - web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps.html

* rendering/RenderLayerScrollableArea.cpp:
(WebCore::RenderLayerScrollableArea::scrollToOffset): Modified this method to return the snapped
scroll offset.
(WebCore::RenderLayerScrollableArea::updateScrollPosition): Instead of using the original target offset,
use the return value from scrollToOffset to adjust the output rectangle.
* rendering/RenderLayerScrollableArea.h: Update the method definition.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestscsscssscrollsnapnestedscrollIntoViewsnapsexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerScrollableAreacpp">trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerScrollableAreah">trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (279868 => 279869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-07-13 07:52:36 UTC (rev 279868)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2021-07-13 08:17:26 UTC (rev 279869)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2021-07-13  Martin Robinson  <mrobinson@igalia.com>
+
+        RenderLayerScrollableArea::updateScrollPosition assumes that it can scroll to the targeted scroll position
+        https://bugs.webkit.org/show_bug.cgi?id=227803
+
+        Reviewed by Simon Fraser.
+
+        * web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps-expected.txt: Update test result to reflect newly passing test.
+
</ins><span class="cx"> 2021-07-12  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Resync content-security-policy web-platform-tests from upstream
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestscsscssscrollsnapnestedscrollIntoViewsnapsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps-expected.txt (279868 => 279869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps-expected.txt   2021-07-13 07:52:36 UTC (rev 279868)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps-expected.txt      2021-07-13 08:17:26 UTC (rev 279869)
</span><span class="lines">@@ -1,3 +1,3 @@
</span><span class="cx"> 
</span><del>-FAIL All the scrollers affected by scrollIntoView should land on a snap position if one exists. Otherwise, land according to the specified alignment assert_equals: ScrollIntoView ends with the specified alignment if no snap position is specified. expected 1185 but got 1000
</del><ins>+PASS All the scrollers affected by scrollIntoView should land on a snap position if one exists. Otherwise, land according to the specified alignment
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (279868 => 279869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-07-13 07:52:36 UTC (rev 279868)
+++ trunk/Source/WebCore/ChangeLog      2021-07-13 08:17:26 UTC (rev 279869)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2021-07-13  Martin Robinson  <mrobinson@igalia.com>
+
+        RenderLayerScrollableArea::updateScrollPosition assumes that it can scroll to the targeted scroll position
+        https://bugs.webkit.org/show_bug.cgi?id=227803
+
+        Reviewed by Simon Fraser.
+
+        No new tests. This is covered by an existing WPT test:
+          - web-platform-tests/css/css-scroll-snap/nested-scrollIntoView-snaps.html
+
+        * rendering/RenderLayerScrollableArea.cpp:
+        (WebCore::RenderLayerScrollableArea::scrollToOffset): Modified this method to return the snapped
+        scroll offset.
+        (WebCore::RenderLayerScrollableArea::updateScrollPosition): Instead of using the original target offset,
+        use the return value from scrollToOffset to adjust the output rectangle.
+        * rendering/RenderLayerScrollableArea.h: Update the method definition.
+
</ins><span class="cx"> 2021-07-13  Myles C. Maxfield  <mmaxfield@apple.com>
</span><span class="cx"> 
</span><span class="cx">         PUA characters have the wrong advance in the fast text codepath
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp (279868 => 279869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp     2021-07-13 07:52:36 UTC (rev 279868)
+++ trunk/Source/WebCore/rendering/RenderLayerScrollableArea.cpp        2021-07-13 08:17:26 UTC (rev 279869)
</span><span class="lines">@@ -254,7 +254,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void RenderLayerScrollableArea::scrollToOffset(const ScrollOffset& scrollOffset, const ScrollPositionChangeOptions& options)
</del><ins>+ScrollOffset RenderLayerScrollableArea::scrollToOffset(const ScrollOffset& scrollOffset, const ScrollPositionChangeOptions& options)
</ins><span class="cx"> {
</span><span class="cx">     if (currentScrollBehaviorStatus() == ScrollBehaviorStatus::InNonNativeAnimation)
</span><span class="cx">         scrollAnimator().cancelAnimations();
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> 
</span><span class="cx">     ScrollOffset clampedScrollOffset = options.clamping == ScrollClamping::Clamped ? clampScrollOffset(scrollOffset) : scrollOffset;
</span><span class="cx">     if (clampedScrollOffset == this->scrollOffset())
</span><del>-        return;
</del><ins>+        return clampedScrollOffset;
</ins><span class="cx"> 
</span><span class="cx">     auto previousScrollType = currentScrollType();
</span><span class="cx">     setCurrentScrollType(options.type);
</span><span class="lines">@@ -277,6 +277,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     setCurrentScrollType(previousScrollType);
</span><ins>+    return snappedOffset;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderLayerScrollableArea::scrollTo(const ScrollPosition& position)
</span><span class="lines">@@ -1754,8 +1755,9 @@
</span><span class="cx">     ScrollOffset clampedScrollOffset = clampScrollOffset(scrollOffset() + toIntSize(roundedIntRect(revealRect).location()));
</span><span class="cx">     if (clampedScrollOffset != scrollOffset() || currentScrollBehaviorStatus() != ScrollBehaviorStatus::NotInAnimation) {
</span><span class="cx">         ScrollOffset oldScrollOffset = scrollOffset();
</span><del>-        scrollToOffset(clampedScrollOffset, options);
-        IntSize scrollOffsetDifference = clampedScrollOffset - oldScrollOffset;
</del><ins>+        ScrollOffset realScrollOffset = scrollToOffset(clampedScrollOffset, options);
+
+        IntSize scrollOffsetDifference = realScrollOffset - oldScrollOffset;
</ins><span class="cx">         auto localExposeRectScrolled = localExposeRect;
</span><span class="cx">         localExposeRectScrolled.move(-scrollOffsetDifference);
</span><span class="cx">         return LayoutRect(box->localToAbsoluteQuad(FloatQuad(FloatRect(localExposeRectScrolled)), UseTransforms).boundingBox());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerScrollableAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h (279868 => 279869)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h       2021-07-13 07:52:36 UTC (rev 279868)
+++ trunk/Source/WebCore/rendering/RenderLayerScrollableArea.h  2021-07-13 08:17:26 UTC (rev 279869)
</span><span class="lines">@@ -83,7 +83,10 @@
</span><span class="cx">     // Scrolling methods for layers that can scroll their overflow.
</span><span class="cx">     void scrollByRecursively(const IntSize& delta, ScrollableArea** scrolledArea = nullptr);
</span><span class="cx"> 
</span><del>-    WEBCORE_EXPORT void scrollToOffset(const ScrollOffset&, const ScrollPositionChangeOptions& = ScrollPositionChangeOptions::createProgrammatic());
</del><ins>+    // Attempt to scroll the given ScrollOffset, returning the real target offset after it has
+    // been adjusted by scroll snapping.
+    WEBCORE_EXPORT ScrollOffset scrollToOffset(const ScrollOffset&, const ScrollPositionChangeOptions& = ScrollPositionChangeOptions::createProgrammatic());
+
</ins><span class="cx">     void scrollToXPosition(int x, const ScrollPositionChangeOptions&);
</span><span class="cx">     void scrollToYPosition(int y, const ScrollPositionChangeOptions&);
</span><span class="cx">     void setScrollPosition(const ScrollPosition&, const ScrollPositionChangeOptions&);
</span></span></pre>
</div>
</div>

</body>
</html>