Changeset 245065 in webkit

Timestamp:

May 8, 2019 1:28:22 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

[GTK] Support navigation gesture on touchscreens
​https://bugs.webkit.org/show_bug.cgi?id=197690

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

Touch events generate scroll events that are handled in webkitWebViewBaseHandleWheelEvent(),
bypassing webkitWebViewBaseScrollEvent(). Because of that, ViewGestureController never receives
them. Hence pass scroll events to ViewGestureController in webkitWebViewBaseHandleWheelEvent()
instead.

For touch events, gesture progress calculation has to take window width into account to make
the page perfectly follow finger, and deltas are additionally divided by Scrollbar::pixelsPerLineStep(),
so compensate for that.

For touchpad events, change delta multiplier to 10 to match GTK behavior, and introduce a 400px
base width so the swipe speed doesn't change from the previous behavior.

Because of the multiplier change, threshold for triggering the gesture with touchpad is now 4
times larger.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseHandleWheelEvent): Move ViewGestureController bits here.
(webkitWebViewBaseScrollEvent): Removed ViewGestureController bits.

• UIProcess/gtk/ViewGestureControllerGtk.cpp:

(WebKit::ViewGestureController::PendingSwipeTracker::scrollEventCanInfluenceSwipe):
Allow events from touchscreen devices.
(WebKit::isTouchEvent): Added.
(WebKit::ViewGestureController::PendingSwipeTracker::scrollEventGetScrollingDeltas):
Change delta multipliers.
(WebKit::ViewGestureController::SwipeProgressTracker::handleEvent):
Change delta multipliers, account for view width for touchscreen events.

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-05-08  Alexander Mikhaylenko  <exalm7659@gmail.com>
+
+        [GTK] Support navigation gesture on touchscreens
+        https://bugs.webkit.org/show_bug.cgi?id=197690
+
+        Reviewed by Michael Catanzaro.
+
+        Touch events generate scroll events that are handled in webkitWebViewBaseHandleWheelEvent(),
+        bypassing webkitWebViewBaseScrollEvent(). Because of that, ViewGestureController never receives
+        them. Hence pass scroll events to ViewGestureController in webkitWebViewBaseHandleWheelEvent()
+        instead.
+
+        For touch events, gesture progress calculation has to take window width into account to make
+        the page perfectly follow finger, and deltas are additionally divided by Scrollbar::pixelsPerLineStep(),
+        so compensate for that.
+
+        For touchpad events, change delta multiplier to 10 to match GTK behavior, and introduce a 400px
+        base width so the swipe speed doesn't change from the previous behavior.
+
+        Because of the multiplier change, threshold for triggering the gesture with touchpad is now 4
+        times larger.
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseHandleWheelEvent): Move ViewGestureController bits here.
+        (webkitWebViewBaseScrollEvent): Removed ViewGestureController bits.
+        * UIProcess/gtk/ViewGestureControllerGtk.cpp:
+        (WebKit::ViewGestureController::PendingSwipeTracker::scrollEventCanInfluenceSwipe):
+        Allow events from touchscreen devices.
+        (WebKit::isTouchEvent): Added.
+        (WebKit::ViewGestureController::PendingSwipeTracker::scrollEventGetScrollingDeltas):
+        Change delta multipliers.
+        (WebKit::ViewGestureController::SwipeProgressTracker::handleEvent):
+        Change delta multipliers, account for view width for touchscreen events.
+
 2019-05-08  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -851 +851 @@
 static void webkitWebViewBaseHandleWheelEvent(WebKitWebViewBase* webViewBase, GdkEvent* event, Optional<WebWheelEvent::Phase> phase = WTF::nullopt, Optional<WebWheelEvent::Phase> momentum = WTF::nullopt)
 {
+    ViewGestureController* controller = webkitWebViewBaseViewGestureController(webViewBase);
+    if (controller && controller->isSwipeGestureEnabled() && controller->handleScrollWheelEvent(reinterpret_cast<GdkEventScroll*>(event)))
+        return;
+
     WebKitWebViewBasePrivate* priv = webViewBase->priv;
     ASSERT(!priv->dialog);
@@ -890 +894 @@
         }
     }
-
-    ViewGestureController* controller = webkitWebViewBaseViewGestureController(webViewBase);
-    if (controller && controller->isSwipeGestureEnabled() && controller->handleScrollWheelEvent(event))
-        return GDK_EVENT_STOP;
 
     webkitWebViewBaseHandleWheelEvent(webViewBase, reinterpret_cast<GdkEvent*>(event));

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

@@ -37 +37 @@
 static const double swipeAnimationBaseVelocity = 0.002;
 
+// GTK divides all scroll deltas by 10, compensate for that
+static const double gtkScrollDeltaMultiplier = 10;
+static const double swipeTouchpadBaseWidth = 400;
+
 // This is derivative of the easing function at t=0
 static const double swipeAnimationDurationMultiplier = 3;
@@ -83 +87 @@
     // FIXME: Should it maybe be allowed on mice/trackpoints as well? The GDK_SCROLL_SMOOTH
     // requirement already filters out most mice, and it works pretty well on a trackpoint
-    return event->direction == GDK_SCROLL_SMOOTH && source == GDK_SOURCE_TOUCHPAD;
+    return event->direction == GDK_SCROLL_SMOOTH && (source == GDK_SOURCE_TOUCHPAD || source == GDK_SOURCE_TOUCHSCREEN);
+}
+
+static bool isTouchEvent(GdkEventScroll* event)
+{
+    GdkDevice* device = gdk_event_get_source_device(reinterpret_cast<GdkEvent*>(event));
+    GdkInputSource source = gdk_device_get_source(device);
+
+    return source == GDK_SOURCE_TOUCHSCREEN;
 }
 
 FloatSize ViewGestureController::PendingSwipeTracker::scrollEventGetScrollingDeltas(GdkEventScroll* event)
 {
+    double multiplier = isTouchEvent(event) ? Scrollbar::pixelsPerLineStep() : gtkScrollDeltaMultiplier;
+
     // GdkEventScroll deltas are inverted compared to NSEvent, so invert them again
-    return -FloatSize(event->delta_x, event->delta_y) * Scrollbar::pixelsPerLineStep();
+    return -FloatSize(event->delta_x, event->delta_y) * multiplier;
 }
 
@@ -170 +184 @@
     }
 
-    double deltaX = -event->delta_x / Scrollbar::pixelsPerLineStep();
+    double deltaX = -event->delta_x;
+    if (isTouchEvent(event))
+        deltaX *= (double) Scrollbar::pixelsPerLineStep() / m_webPageProxy.viewSize().width();
+    else
+        deltaX *= gtkScrollDeltaMultiplier / swipeTouchpadBaseWidth;
 
     Seconds time = Seconds::fromMilliseconds(event->time);