Changeset 250820 in webkit

Timestamp:

Oct 8, 2019 3:03:38 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

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

Patch by Alexander Mikhaylenko <Alexander Mikhaylenko> on 2019-10-08
Reviewed by Carlos Garcia Campos.

Measure velocity threshold in pixels per second rather than distance (range [0-1])
per second. The value is the same as it was on touchpads, since a fixed distance is
used, but is now consistent on touchscreens, regardless of the webview width.

Add a threshold for cancelling gesture when the page is more than halfway
through, so that it's symmetric with the first half.

Align the moving page to pixel grid on hidpi devices correctly. Just
rounding the position doesn't work correctly, since the cairo context is
pre-scaled. Multiplying by scale factor, rounding and then dividing by
scale factor fixes this.

• UIProcess/ViewGestureController.h:
• UIProcess/gtk/ViewGestureControllerGtk.cpp:

(WebKit::ViewGestureController::SwipeProgressTracker::reset):
(WebKit::ViewGestureController::SwipeProgressTracker::handleEvent):
(WebKit::ViewGestureController::SwipeProgressTracker::shouldCancel):
(WebKit::ViewGestureController::draw):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-10-08  Alexander Mikhaylenko  <alexm@gnome.org>
+
+        [GTK] Navigation gesture improvements
+        https://bugs.webkit.org/show_bug.cgi?id=202645
+
+        Reviewed by Carlos Garcia Campos.
+
+        Measure velocity threshold in pixels per second rather than distance (range [0-1])
+        per second. The value is the same as it was on touchpads, since a fixed distance is
+        used, but is now consistent on touchscreens, regardless of the webview width.
+
+        Add a threshold for cancelling gesture when the page is more than halfway
+        through, so that it's symmetric with the first half.
+
+        Align the moving page to pixel grid on hidpi devices correctly. Just
+        rounding the position doesn't work correctly, since the cairo context is
+        pre-scaled. Multiplying by scale factor, rounding and then dividing by
+        scale factor fixes this.
+
+        * UIProcess/ViewGestureController.h:
+        * UIProcess/gtk/ViewGestureControllerGtk.cpp:
+        (WebKit::ViewGestureController::SwipeProgressTracker::reset):
+        (WebKit::ViewGestureController::SwipeProgressTracker::handleEvent):
+        (WebKit::ViewGestureController::SwipeProgressTracker::shouldCancel):
+        (WebKit::ViewGestureController::draw):
+
 2019-10-08  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit/UIProcess/ViewGestureController.h

@@ -400 +400 @@
         Seconds m_prevTime;
         double m_velocity { 0 };
+        double m_distance { 0 };
 
         Seconds m_startTime;

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

@@ -46 +46 @@
 
 static const double swipeCancelArea = 0.5;
-static const double swipeCancelVelocityThreshold = 0.001;
+static const double swipeCancelVelocityThreshold = 0.4;
 
 static bool isEventStop(GdkEventScroll* event)
@@ -142 +142 @@
     m_prevTime = 0_ms;
     m_velocity = 0;
+    m_distance = 0;
     m_cancelled = false;
 }
@@ -179 +180 @@
 
     double deltaX = -eventDeltaX;
-    if (isTouchEvent(event))
-        deltaX *= (double) Scrollbar::pixelsPerLineStep() / m_webPageProxy.viewSize().width();
-    else
-        deltaX *= gtkScrollDeltaMultiplier / swipeTouchpadBaseWidth;
+    if (isTouchEvent(event)) {
+        m_distance = m_webPageProxy.viewSize().width();
+        deltaX *= static_cast<double>(Scrollbar::pixelsPerLineStep()) / m_distance;
+    } else {
+        m_distance = swipeTouchpadBaseWidth;
+        deltaX *= gtkScrollDeltaMultiplier / m_distance;
+    }
 
     Seconds time = Seconds::fromMilliseconds(eventTime);
@@ -204 +208 @@
 {
     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);
+    double relativeVelocity = m_velocity * (swipingLeft ? 1 : -1);
+
+    if (abs(m_progress) > swipeCancelArea)
+        return (relativeVelocity * m_distance < -swipeCancelVelocityThreshold);
+
+    return (relativeVelocity * m_distance < swipeCancelVelocityThreshold);
 }
 
@@ -405 +407 @@
     int width = size.width();
     int height = size.height();
-
-    double swipingLayerOffset = (swipingLeft ? 0 : width) + floor(width * progress);
+    double scale = m_webPageProxy.deviceScaleFactor();
+
+    double swipingLayerOffset = (swipingLeft ? 0 : width) + floor(width * progress * scale) / scale;
 
     double dimmingProgress = swipingLeft ? 1 - progress : -progress;