<!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>[284097] 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/284097">284097</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2021-10-13 09:54:18 -0700 (Wed, 13 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[WK1] Tests for smooth scrolling of a window fail
https://bugs.webkit.org/show_bug.cgi?id=191357

Reviewed by Sam Weinig.
Source/WebCore:

The scrolling functions around ScrollView are a maze of twisty passages, with no clear
bottleneck functions, and aliasing of scroll position between ScrollableArea, ScrollAnimator
and the platform widget in WK1.

Fallout from this was that animation-driven scrolling, which ends up in
ScrollView::scrollTo(), did nothing if there was a platform widget.

In addition, there was no feedback that updated ScrollAnimator's notion of scroll position
when the platform widget scrolled, causing repeated animated scrolls to fail.

Cleaning up the mess will take time; for now, just patch ScrollView::scrollTo() to do
something if there's a platform widget, and have ScrollView::scrollOffsetChangedViaPlatformWidget()
push the new position to the scroll animator.

Tested by tests in imported/w3c/web-platform-tests/css/cssom-view/

* platform/ScrollView.cpp:
(WebCore::ScrollView::scrollOffsetChangedViaPlatformWidget):
(WebCore::ScrollView::scrollTo):
(WebCore::ScrollView::setScrollPosition):
* platform/ScrollableArea.cpp:
(WebCore::ScrollableArea::scrollPositionChanged): Just some auto.

LayoutTests:

Some cssom-view tests pass now in WK1.

* platform/mac-wk1/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollableAreacpp">trunk/Source/WebCore/platform/ScrollableArea.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (284096 => 284097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-10-13 16:47:03 UTC (rev 284096)
+++ trunk/LayoutTests/ChangeLog 2021-10-13 16:54:18 UTC (rev 284097)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2021-10-13  Simon Fraser  <simon.fraser@apple.com>
+
+        [WK1] Tests for smooth scrolling of a window fail
+        https://bugs.webkit.org/show_bug.cgi?id=191357
+
+        Reviewed by Sam Weinig.
+
+        Some cssom-view tests pass now in WK1.
+
+        * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2021-10-13  Alan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [LFC][IFC] Do not break at the inline box boundary when wrapping is not allowed
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (284096 => 284097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations      2021-10-13 16:47:03 UTC (rev 284096)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2021-10-13 16:54:18 UTC (rev 284097)
</span><span class="lines">@@ -819,12 +819,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/189594 imported/w3c/web-platform-tests/css/css-animations/pending-style-changes-001.html [ Pass Failure ]
</span><span class="cx"> 
</span><del>-# Tests for smooth scroll behavior do not all work and they are slow, so let's just skip them.
-webkit.org/b/191357 imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-root.html [ Skip ]
-webkit.org/b/191357 imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-main-frame-window.html [ Skip ]
-webkit.org/b/191357 imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-subframe-root.html [ Skip ]
-webkit.org/b/191357 imported/w3c/web-platform-tests/css/cssom-view/scroll-behavior-subframe-window.html [ Skip ]
-
</del><span class="cx"> webkit.org/b/189756 compositing/filters/opacity-change-on-filtered-paints-into-ancestor.html [ Pass ImageOnlyFailure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/189723 http/tests/security/cross-origin-xsl-redirect-BLOCKED.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (284096 => 284097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-13 16:47:03 UTC (rev 284096)
+++ trunk/Source/WebCore/ChangeLog      2021-10-13 16:54:18 UTC (rev 284097)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2021-10-13  Simon Fraser  <simon.fraser@apple.com>
+
+        [WK1] Tests for smooth scrolling of a window fail
+        https://bugs.webkit.org/show_bug.cgi?id=191357
+
+        Reviewed by Sam Weinig.
+        
+        The scrolling functions around ScrollView are a maze of twisty passages, with no clear
+        bottleneck functions, and aliasing of scroll position between ScrollableArea, ScrollAnimator
+        and the platform widget in WK1.
+
+        Fallout from this was that animation-driven scrolling, which ends up in
+        ScrollView::scrollTo(), did nothing if there was a platform widget.
+
+        In addition, there was no feedback that updated ScrollAnimator's notion of scroll position
+        when the platform widget scrolled, causing repeated animated scrolls to fail.
+
+        Cleaning up the mess will take time; for now, just patch ScrollView::scrollTo() to do
+        something if there's a platform widget, and have ScrollView::scrollOffsetChangedViaPlatformWidget()
+        push the new position to the scroll animator.
+
+        Tested by tests in imported/w3c/web-platform-tests/css/cssom-view/
+
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::scrollOffsetChangedViaPlatformWidget):
+        (WebCore::ScrollView::scrollTo):
+        (WebCore::ScrollView::setScrollPosition):
+        * platform/ScrollableArea.cpp:
+        (WebCore::ScrollableArea::scrollPositionChanged): Just some auto.
+
</ins><span class="cx"> 2021-10-12  Alexey Proskuryakov  <ap@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Invoke build scripts with python3 explicitly
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (284096 => 284097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp     2021-10-13 16:47:03 UTC (rev 284096)
+++ trunk/Source/WebCore/platform/ScrollView.cpp        2021-10-13 16:54:18 UTC (rev 284097)
</span><span class="lines">@@ -454,6 +454,7 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     scrollOffsetChangedViaPlatformWidgetImpl(oldOffset, newOffset);
</span><ins>+    scrollAnimator().setCurrentPosition(scrollPosition());
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollView::handleDeferredScrollUpdateAfterContentSizeChange()
</span><span class="lines">@@ -482,6 +483,11 @@
</span><span class="cx">     if (scrollDelta.isZero())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    if (platformWidget()) {
+        platformSetScrollPosition(newPosition);
+        return;
+    }
+
</ins><span class="cx">     m_scrollPosition = newPosition;
</span><span class="cx"> 
</span><span class="cx">     if (scrollbarsSuppressed())
</span><span class="lines">@@ -518,16 +524,16 @@
</span><span class="cx">     if (prohibitsScrolling())
</span><span class="cx">         return;
</span><span class="cx"> 
</span><ins>+    if (scrollAnimationStatus() == ScrollAnimationStatus::Animating) {
+        scrollAnimator().cancelAnimations();
+        stopAsyncAnimatedScroll();
+    }
+
</ins><span class="cx">     if (platformWidget()) {
</span><span class="cx">         platformSetScrollPosition(scrollPosition);
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (scrollAnimationStatus() == ScrollAnimationStatus::Animating) {
-        scrollAnimator().cancelAnimations();
-        stopAsyncAnimatedScroll();
-    }
-
</del><span class="cx">     ScrollPosition newScrollPosition = (!delegatesScrolling() && options.clamping == ScrollClamping::Clamped) ? adjustScrollPositionWithinRange(scrollPosition) : scrollPosition;
</span><span class="cx">     if ((!delegatesScrolling() || currentScrollType() == ScrollType::User) && newScrollPosition == this->scrollPosition()) {
</span><span class="cx">         LOG_WITH_STREAM(Scrolling, stream << "ScrollView::setScrollPosition " << scrollPosition << " return for no change");
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollableAreacpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollableArea.cpp (284096 => 284097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollableArea.cpp 2021-10-13 16:47:03 UTC (rev 284096)
+++ trunk/Source/WebCore/platform/ScrollableArea.cpp    2021-10-13 16:54:18 UTC (rev 284097)
</span><span class="lines">@@ -181,10 +181,10 @@
</span><span class="cx">     // Tell the derived class to scroll its contents.
</span><span class="cx">     setScrollOffset(scrollOffsetFromPosition(position));
</span><span class="cx"> 
</span><del>-    Scrollbar* verticalScrollbar = this->verticalScrollbar();
</del><ins>+    auto* verticalScrollbar = this->verticalScrollbar();
</ins><span class="cx"> 
</span><span class="cx">     // Tell the scrollbars to update their thumb postions.
</span><del>-    if (Scrollbar* horizontalScrollbar = this->horizontalScrollbar()) {
</del><ins>+    if (auto* horizontalScrollbar = this->horizontalScrollbar()) {
</ins><span class="cx">         horizontalScrollbar->offsetDidChange();
</span><span class="cx">         if (horizontalScrollbar->isOverlayScrollbar() && !hasLayerForHorizontalScrollbar()) {
</span><span class="cx">             if (!verticalScrollbar)
</span></span></pre>
</div>
</div>

</body>
</html>