Changeset 241952 in webkit

Timestamp:

Feb 22, 2019 10:46:25 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Navigation gesture improvements
​https://bugs.webkit.org/show_bug.cgi?id=194943

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

Cancel the gesture if progress is less than 0.5 and velocity is not high enough.

Allow to continue the gesture during animation. Introduce finished state to be used
when showing snapshot after the animation ends.

Fix duration calculation, also slow it down so that the initial velocity matches
what it was during the gesture.

• UIProcess/ViewGestureController.h: Add shouldCancel() and State::Finishing to SwipeProgressTracker.
• UIProcess/gtk/ViewGestureControllerGtk.cpp:

(WebKit::ViewGestureController::SwipeProgressTracker::handleEvent):
Fix velocity calculation, allow scrolling during State::Animating.
(WebKit::ViewGestureController::SwipeProgressTracker::shouldCancel): Added.
(WebKit::ViewGestureController::SwipeProgressTracker::startAnimation): Use shouldCancel() and fix duration calculation.
(WebKit::ViewGestureController::SwipeProgressTracker::endAnimation): Set state to State::Finishing when the animation ends.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/ViewGestureController.h (modified) (1 diff)
• UIProcess/gtk/ViewGestureControllerGtk.cpp (modified) (7 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-22  Alexander Mikhaylenko  <exalm7659@gmail.com>
+
+        [GTK] Navigation gesture improvements
+        https://bugs.webkit.org/show_bug.cgi?id=194943
+
+        Reviewed by Michael Catanzaro.
+
+        Cancel the gesture if progress is less than 0.5 and velocity is not high enough.
+
+        Allow to continue the gesture during animation. Introduce finished state to be used
+        when showing snapshot after the animation ends.
+
+        Fix duration calculation, also slow it down so that the initial velocity matches
+        what it was during the gesture.
+
+        * UIProcess/ViewGestureController.h: Add shouldCancel() and State::Finishing to SwipeProgressTracker.
+        * UIProcess/gtk/ViewGestureControllerGtk.cpp:
+        (WebKit::ViewGestureController::SwipeProgressTracker::handleEvent):
+        Fix velocity calculation, allow scrolling during State::Animating.
+        (WebKit::ViewGestureController::SwipeProgressTracker::shouldCancel): Added.
+        (WebKit::ViewGestureController::SwipeProgressTracker::startAnimation): Use shouldCancel() and fix duration calculation.
+        (WebKit::ViewGestureController::SwipeProgressTracker::endAnimation): Set state to State::Finishing when the animation ends.
+
 2019-02-22  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/ViewGestureController.h

@@ -375 +375 @@
             Pending,
             Scrolling,
-            Animating
+            Animating,
+            Finishing
         };
+
+        bool shouldCancel();
 
         void startAnimation();

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

@@ -36 +36 @@
 static const Seconds swipeMaxAnimationDuration = 400_ms;
 
+// This is derivative of the easing function at t=0
+static const double swipeAnimationDurationMultiplier = 3;
+
+static const double swipeCancelArea = 0.5;
+static const double swipeCancelVelocityThreshold = 0.001;
+
 static const double swipeOverlayShadowOpacity = 0.06;
 static const double swipeOverlayDimmingOpacity = 0.12;
@@ -136 +142 @@
 bool ViewGestureController::SwipeProgressTracker::handleEvent(GdkEventScroll* event)
 {
+    // Don't allow scrolling while the next page is loading
+    if (m_state == State::Finishing)
+        return true;
+
+    // Stop current animation, if any
+    if (m_state == State::Animating) {
+        GtkWidget* widget = m_webPageProxy.viewWidget();
+        gtk_widget_remove_tick_callback(widget, m_tickCallbackID);
+        m_tickCallbackID = 0;
+
+        m_cancelled = false;
+        m_state = State::Pending;
+    }
+
     if (m_state == State::Pending) {
         m_viewGestureController.beginSwipeGesture(m_targetItem.get(), m_direction);
@@ -141 +161 @@
     }
 
-    // Don't allow scrolling during animation
-    if (m_state == State::Animating)
-        return true;
-
     if (m_state != State::Scrolling)
         return false;
@@ -153 +169 @@
     }
 
+    double deltaX = -event->delta_x / Scrollbar::pixelsPerLineStep();
+
     Seconds time = Seconds::fromMilliseconds(event->time);
-    m_velocity = -event->delta_x / (time - m_prevTime).milliseconds();
+    if (time != m_prevTime)
+        m_velocity = deltaX / (time - m_prevTime).milliseconds();
 
     m_prevTime = time;
-    m_progress -= event->delta_x / Scrollbar::pixelsPerLineStep();
+    m_progress += deltaX;
 
     bool swipingLeft = m_viewGestureController.isPhysicallySwipingLeft(m_direction);
@@ -169 +188 @@
 }
 
+bool ViewGestureController::SwipeProgressTracker::shouldCancel()
+{
+    bool swipingLeft = m_viewGestureController.isPhysicallySwipingLeft(m_direction);
+
+    if (swipingLeft && m_velocity < 0)
+        return true;
+
+    if (!swipingLeft && m_velocity > 0)
+        return true;
+
+    return (abs(m_progress) < swipeCancelArea && abs(m_velocity) < swipeCancelVelocityThreshold);
+}
+
 void ViewGestureController::SwipeProgressTracker::startAnimation()
 {
-    bool swipingLeft = m_viewGestureController.isPhysicallySwipingLeft(m_direction);
-    m_cancelled = swipingLeft ? (m_velocity <= 0) : (m_velocity >= 0);
+    m_cancelled = shouldCancel();
 
     m_state = State::Animating;
@@ -181 +212 @@
         m_endProgress = 0;
     else
-        m_endProgress = swipingLeft ? 1 : -1;
-
-    Seconds duration = Seconds::fromMilliseconds(std::abs((m_progress - m_endProgress) / m_velocity) * Scrollbar::pixelsPerLineStep());
-    duration = std::min(std::max(duration, swipeMinAnimationDuration), swipeMaxAnimationDuration);
+        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);
+    }
 
     GtkWidget* widget = m_webPageProxy.viewWidget();
@@ -227 +261 @@
 void ViewGestureController::SwipeProgressTracker::endAnimation()
 {
+    m_state = State::Finishing;
     m_viewGestureController.endSwipeGesture(m_targetItem.get(), m_cancelled);
 }