Changeset 244649 in webkit

Timestamp:

Apr 25, 2019 9:59:04 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Back/Forward gesture interferes with scrolling
​https://bugs.webkit.org/show_bug.cgi?id=197168

Patch by Alexander Mikhaylenko <​exalm7659@gmail.com> on 2019-04-25
Reviewed by Michael Catanzaro.

When the gesture is released with 0 velocity close to an edge of the webview,
the finishing animation is way too long, and in some cases it can look like the
gesture is already over, when it's still animating. By scrolling vertically while
that happens, it's possible to reset animation over and over again.

To reduce the duration in this case, instead of using maximum possible duration
(400ms), introduce a base velocity and use it for calculating the duration if
the actual velocity, relative to the end point, is equal to or less than 0.

• UIProcess/gtk/ViewGestureControllerGtk.cpp:

(WebKit::ViewGestureController::SwipeProgressTracker::startAnimation):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/gtk/ViewGestureControllerGtk.cpp (modified) (2 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-04-25  Alexander Mikhaylenko  <exalm7659@gmail.com>
+
+        [GTK] Back/Forward gesture interferes with scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=197168
+
+        Reviewed by Michael Catanzaro.
+
+        When the gesture is released with 0 velocity close to an edge of the webview,
+        the finishing animation is way too long, and in some cases it can look like the
+        gesture is already over, when it's still animating. By scrolling vertically while
+        that happens, it's possible to reset animation over and over again.
+
+        To reduce the duration in this case, instead of using maximum possible duration
+        (400ms), introduce a base velocity and use it for calculating the duration if
+        the actual velocity, relative to the end point, is equal to or less than 0.
+
+        * UIProcess/gtk/ViewGestureControllerGtk.cpp:
+        (WebKit::ViewGestureController::SwipeProgressTracker::startAnimation):
+
 2019-04-25  Alexander Mikhaylenko  <exalm7659@gmail.com>
 

trunk/Source/WebKit/UIProcess/gtk/ViewGestureControllerGtk.cpp

@@ -35 +35 @@
 static const Seconds swipeMinAnimationDuration = 100_ms;
 static const Seconds swipeMaxAnimationDuration = 400_ms;
+static const double swipeAnimationBaseVelocity = 0.002;
 
 // This is derivative of the easing function at t=0
@@ -214 +215 @@
         m_endProgress = m_viewGestureController.isPhysicallySwipingLeft(m_direction) ? 1 : -1;
 
-    Seconds duration = swipeMaxAnimationDuration;
-    if ((m_endProgress - m_progress) * m_velocity > 0) {
-        duration = Seconds::fromMilliseconds(std::abs((m_progress - m_endProgress) / m_velocity * swipeAnimationDurationMultiplier));
-        duration = clampTo<WTF::Seconds>(duration, swipeMinAnimationDuration, swipeMaxAnimationDuration);
-    }
+    double velocity = swipeAnimationBaseVelocity;
+    if ((m_endProgress - m_progress) * m_velocity > 0)
+        velocity = m_velocity;
+
+    Seconds duration = Seconds::fromMilliseconds(std::abs((m_progress - m_endProgress) / velocity * swipeAnimationDurationMultiplier));
+    duration = clampTo<Seconds>(duration, swipeMinAnimationDuration, swipeMaxAnimationDuration);
 
     GtkWidget* widget = m_webPageProxy.viewWidget();