<!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>[284596] trunk/Source/WebCore</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/284596">284596</a></dd>
<dt>Author</dt> <dd>clord@igalia.com</dd>
<dt>Date</dt> <dd>2021-10-21 02:53:50 -0700 (Thu, 21 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Slow scrolling (not matching GTK native scroll amount)
https://bugs.webkit.org/show_bug.cgi?id=197100

Reviewed by Simon Fraser.

Fix up behaviour with interrupting smooth scrolling, mainly on
keyboard-initiated scrolling, but also for the mouse-wheel. When
interrupting a smooth scroll, the animation curve is now changed from
ease-in-out to ease-out and the duration is recalculated.

No new tests, covered by existing tests.

* platform/ScrollAnimation.h:
(WebCore::ScrollAnimation::destinationOffset const):
* platform/ScrollAnimationSmooth.cpp:
(WebCore::ScrollAnimationSmooth::ScrollAnimationSmooth):
(WebCore::ScrollAnimationSmooth::startAnimatedScrollToDestination):
(WebCore::ScrollAnimationSmooth::retargetActiveAnimation):
(WebCore::ScrollAnimationSmooth::animateScroll):
(WebCore::ScrollAnimationSmooth::startOrRetargetAnimation): Deleted.
* platform/ScrollAnimationSmooth.h:
* platform/ScrollAnimator.cpp:
(WebCore::ScrollAnimator::scroll):
* platform/ScrollingEffectsController.cpp:
(WebCore::ScrollingEffectsController::retargetAnimatedScrollBy):
(WebCore::ScrollingEffectsController::handleWheelEvent):
* platform/ScrollingEffectsController.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimationh">trunk/Source/WebCore/platform/ScrollAnimation.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimationSmoothcpp">trunk/Source/WebCore/platform/ScrollAnimationSmooth.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimationSmoothh">trunk/Source/WebCore/platform/ScrollAnimationSmooth.h</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollAnimatorcpp">trunk/Source/WebCore/platform/ScrollAnimator.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollingEffectsControllercpp">trunk/Source/WebCore/platform/ScrollingEffectsController.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollingEffectsControllerh">trunk/Source/WebCore/platform/ScrollingEffectsController.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (284595 => 284596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-21 09:48:26 UTC (rev 284595)
+++ trunk/Source/WebCore/ChangeLog      2021-10-21 09:53:50 UTC (rev 284596)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2021-10-21  Chris Lord  <clord@igalia.com>
+
+        [GTK] Slow scrolling (not matching GTK native scroll amount)
+        https://bugs.webkit.org/show_bug.cgi?id=197100
+
+        Reviewed by Simon Fraser.
+
+        Fix up behaviour with interrupting smooth scrolling, mainly on
+        keyboard-initiated scrolling, but also for the mouse-wheel. When
+        interrupting a smooth scroll, the animation curve is now changed from
+        ease-in-out to ease-out and the duration is recalculated.
+
+        No new tests, covered by existing tests.
+
+        * platform/ScrollAnimation.h:
+        (WebCore::ScrollAnimation::destinationOffset const):
+        * platform/ScrollAnimationSmooth.cpp:
+        (WebCore::ScrollAnimationSmooth::ScrollAnimationSmooth):
+        (WebCore::ScrollAnimationSmooth::startAnimatedScrollToDestination):
+        (WebCore::ScrollAnimationSmooth::retargetActiveAnimation):
+        (WebCore::ScrollAnimationSmooth::animateScroll):
+        (WebCore::ScrollAnimationSmooth::startOrRetargetAnimation): Deleted.
+        * platform/ScrollAnimationSmooth.h:
+        * platform/ScrollAnimator.cpp:
+        (WebCore::ScrollAnimator::scroll):
+        * platform/ScrollingEffectsController.cpp:
+        (WebCore::ScrollingEffectsController::retargetAnimatedScrollBy):
+        (WebCore::ScrollingEffectsController::handleWheelEvent):
+        * platform/ScrollingEffectsController.h:
+
</ins><span class="cx"> 2021-10-20  Brady Eidson  <beidson@apple.com>
</span><span class="cx"> 
</span><span class="cx">         WebKit Managed Notifications: Skeleton NotificationProvider
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimation.h (284595 => 284596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimation.h  2021-10-21 09:48:26 UTC (rev 284595)
+++ trunk/Source/WebCore/platform/ScrollAnimation.h     2021-10-21 09:53:50 UTC (rev 284596)
</span><span class="lines">@@ -78,6 +78,7 @@
</span><span class="cx">     virtual void updateScrollExtents() { };
</span><span class="cx">     
</span><span class="cx">     FloatPoint currentOffset() const { return m_currentOffset; }
</span><ins>+    virtual std::optional<FloatPoint> destinationOffset() const { return std::nullopt; }
</ins><span class="cx"> 
</span><span class="cx">     virtual void serviceAnimation(MonotonicTime) = 0;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimationSmoothcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimationSmooth.cpp (284595 => 284596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimationSmooth.cpp  2021-10-21 09:48:26 UTC (rev 284595)
+++ trunk/Source/WebCore/platform/ScrollAnimationSmooth.cpp     2021-10-21 09:53:50 UTC (rev 284596)
</span><span class="lines">@@ -41,7 +41,7 @@
</span><span class="cx"> 
</span><span class="cx"> ScrollAnimationSmooth::ScrollAnimationSmooth(ScrollAnimationClient& client)
</span><span class="cx">     : ScrollAnimation(Type::Smooth, client)
</span><del>-    , m_easeInOutTimingFunction(CubicBezierTimingFunction::create(CubicBezierTimingFunction::TimingFunctionPreset::EaseInOut))
</del><ins>+    , m_timingFunction(CubicBezierTimingFunction::create())
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -49,11 +49,21 @@
</span><span class="cx"> 
</span><span class="cx"> bool ScrollAnimationSmooth::startAnimatedScrollToDestination(const FloatPoint& fromOffset, const FloatPoint& destinationOffset)
</span><span class="cx"> {
</span><ins>+    if (!isActive() && fromOffset == destinationOffset)
+        return false;
+
+    auto extents = m_client.scrollExtentsForAnimation(*this);
+
+    m_startTime = MonotonicTime::now();
</ins><span class="cx">     m_startOffset = fromOffset;
</span><del>-    m_duration = durationFromDistance(destinationOffset - m_startOffset);
</del><ins>+    m_destinationOffset = destinationOffset.constrainedBetween(extents.minimumScrollOffset(), extents.maximumScrollOffset());
+    m_duration = durationFromDistance(m_destinationOffset - m_startOffset);
+    downcast<CubicBezierTimingFunction>(*m_timingFunction).setTimingFunctionPreset(CubicBezierTimingFunction::TimingFunctionPreset::EaseInOut);
</ins><span class="cx"> 
</span><del>-    auto extents = m_client.scrollExtentsForAnimation(*this);
-    return startOrRetargetAnimation(extents, destinationOffset);
</del><ins>+    if (!isActive())
+        didStart(MonotonicTime::now());
+
+    return true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool ScrollAnimationSmooth::retargetActiveAnimation(const FloatPoint& newOffset)
</span><span class="lines">@@ -62,18 +72,18 @@
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><span class="cx">     auto extents = m_client.scrollExtentsForAnimation(*this);
</span><del>-    return startOrRetargetAnimation(extents, newOffset);
-}
</del><span class="cx"> 
</span><del>-bool ScrollAnimationSmooth::startOrRetargetAnimation(const ScrollExtents& extents, const FloatPoint& destinationOffset)
-{
-    m_destinationOffset = destinationOffset.constrainedBetween(extents.minimumScrollOffset(), extents.maximumScrollOffset());
-    bool needToScroll = m_startOffset != m_destinationOffset;
</del><ins>+    m_startTime = MonotonicTime::now();
+    m_startOffset = m_currentOffset;
+    m_destinationOffset = newOffset.constrainedBetween(extents.minimumScrollOffset(), extents.maximumScrollOffset());
+    m_duration = durationFromDistance(m_destinationOffset - m_startOffset);
+    downcast<CubicBezierTimingFunction>(*m_timingFunction).setTimingFunctionPreset(CubicBezierTimingFunction::TimingFunctionPreset::EaseOut);
+    m_timingFunction = CubicBezierTimingFunction::create(CubicBezierTimingFunction::TimingFunctionPreset::EaseOut);
</ins><span class="cx"> 
</span><del>-    if (needToScroll && !isActive())
-        didStart(MonotonicTime::now());
</del><ins>+    if (m_currentOffset == m_destinationOffset)
+        return false;
</ins><span class="cx"> 
</span><del>-    return needToScroll;
</del><ins>+    return true;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void ScrollAnimationSmooth::updateScrollExtents()
</span><span class="lines">@@ -108,7 +118,7 @@
</span><span class="cx">     currentTime = std::min(currentTime, endTime);
</span><span class="cx"> 
</span><span class="cx">     double fractionComplete = (currentTime - m_startTime) / m_duration;
</span><del>-    double progress = m_easeInOutTimingFunction->transformProgress(fractionComplete, m_duration.value());
</del><ins>+    double progress = m_timingFunction->transformProgress(fractionComplete, m_duration.value());
</ins><span class="cx"> 
</span><span class="cx">     m_currentOffset = {
</span><span class="cx">         linearInterpolation(progress, m_startOffset.x(), m_destinationOffset.x()),
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimationSmoothh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimationSmooth.h (284595 => 284596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimationSmooth.h    2021-10-21 09:48:26 UTC (rev 284595)
+++ trunk/Source/WebCore/platform/ScrollAnimationSmooth.h       2021-10-21 09:53:50 UTC (rev 284596)
</span><span class="lines">@@ -41,12 +41,10 @@
</span><span class="cx">     bool startAnimatedScrollToDestination(const FloatPoint& fromOffset, const FloatPoint& destinationOffset);
</span><span class="cx">     bool retargetActiveAnimation(const FloatPoint& newOffset) final;
</span><span class="cx"> 
</span><del>-    const FloatPoint& destinationOffset() const { return m_destinationOffset; }
</del><ins>+    std::optional<FloatPoint> destinationOffset() const final { return m_destinationOffset; }
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx"> 
</span><del>-    bool startOrRetargetAnimation(const ScrollExtents&, const FloatPoint& destinationOffset);
-
</del><span class="cx">     void updateScrollExtents() final;
</span><span class="cx">     void serviceAnimation(MonotonicTime) final;
</span><span class="cx"> 
</span><span class="lines">@@ -59,7 +57,7 @@
</span><span class="cx">     FloatPoint m_startOffset;
</span><span class="cx">     FloatPoint m_destinationOffset;
</span><span class="cx"> 
</span><del>-    RefPtr<TimingFunction> m_easeInOutTimingFunction;
</del><ins>+    RefPtr<TimingFunction> m_timingFunction;
</ins><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollAnimatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollAnimator.cpp (284595 => 284596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollAnimator.cpp 2021-10-21 09:48:26 UTC (rev 284595)
+++ trunk/Source/WebCore/platform/ScrollAnimator.cpp    2021-10-21 09:53:50 UTC (rev 284596)
</span><span class="lines">@@ -89,6 +89,9 @@
</span><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx">     if (m_scrollableArea.scrollAnimatorEnabled() && platformAllowsScrollAnimation() && !behavior.contains(ScrollBehavior::NeverAnimate)) {
</span><ins>+        if (m_scrollController.retargetAnimatedScrollBy(delta))
+            return true;
+
</ins><span class="cx">         auto startOffset = offsetFromPosition(m_currentPosition);
</span><span class="cx">         auto extents = scrollExtents();
</span><span class="cx">         auto destinationOffset = (startOffset + delta).constrainedBetween(extents.minimumScrollOffset(), extents.maximumScrollOffset());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollingEffectsControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollingEffectsController.cpp (284595 => 284596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollingEffectsController.cpp     2021-10-21 09:48:26 UTC (rev 284595)
+++ trunk/Source/WebCore/platform/ScrollingEffectsController.cpp        2021-10-21 09:53:50 UTC (rev 284596)
</span><span class="lines">@@ -118,6 +118,20 @@
</span><span class="cx">     return downcast<ScrollAnimationSmooth>(*m_currentAnimation).retargetActiveAnimation(newDestinationOffset);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool ScrollingEffectsController::retargetAnimatedScrollBy(FloatSize offset)
+{
+    if (!is<ScrollAnimationSmooth>(m_currentAnimation.get()))
+        return false;
+
+    LOG_WITH_STREAM(ScrollAnimations, stream << "ScrollingEffectsController " << this << " retargetAnimatedScrollBy " << offset);
+
+    ASSERT(m_currentAnimation->isActive());
+    if (auto destinationOffset = m_currentAnimation->destinationOffset())
+        return m_currentAnimation->retargetActiveAnimation(*destinationOffset + offset);
+
+    return false;
+}
+
</ins><span class="cx"> void ScrollingEffectsController::stopAnimatedScroll()
</span><span class="cx"> {
</span><span class="cx">     LOG_WITH_STREAM(ScrollAnimations, stream << "ScrollingEffectsController " << this << " stopAnimatedScroll");
</span><span class="lines">@@ -351,10 +365,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(SMOOTH_SCROLLING)
</span><span class="cx">     if (m_client.scrollAnimationEnabled() && !m_inScrollGesture) {
</span><del>-        if (is<ScrollAnimationSmooth>(m_currentAnimation.get())) {
-            auto lastDestinationOffset = downcast<ScrollAnimationSmooth>(*m_currentAnimation).destinationOffset();
-            retargetAnimatedScroll(lastDestinationOffset + FloatSize { deltaX, deltaY });
-        } else
</del><ins>+        if (!retargetAnimatedScrollBy({ deltaX, deltaY }))
</ins><span class="cx">             startAnimatedScrollToDestination(scrollOffset, scrollOffset + FloatSize { deltaX, deltaY });
</span><span class="cx">         return true;
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollingEffectsControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollingEffectsController.h (284595 => 284596)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollingEffectsController.h       2021-10-21 09:48:26 UTC (rev 284595)
+++ trunk/Source/WebCore/platform/ScrollingEffectsController.h  2021-10-21 09:53:50 UTC (rev 284596)
</span><span class="lines">@@ -135,6 +135,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool startAnimatedScrollToDestination(FloatPoint startOffset, FloatPoint destinationOffset);
</span><span class="cx">     bool retargetAnimatedScroll(FloatPoint newDestinationOffset);
</span><ins>+    bool retargetAnimatedScrollBy(FloatSize);
</ins><span class="cx">     void stopAnimatedScroll();
</span><span class="cx"> 
</span><span class="cx">     void stopKeyboardScrolling();
</span></span></pre>
</div>
</div>

</body>
</html>