Changeset 269151 in webkit

Timestamp:

Oct 29, 2020, 9:53:19 AM (6 years ago)

Author:

Chris Lord

Message:

[WPE] Add axis-locking to kinetic scrolling
​https://bugs.webkit.org/show_bug.cgi?id=209729

Reviewed by Adrian Perez de Castro.

Add axis-locking to scroll gestures on WPE, and new WPE-specific
settings to control the process.

• UIProcess/API/wpe/ScrollGestureController.cpp:

(WebKit::ScrollGestureController::handleEvent):

• UIProcess/API/wpe/ScrollGestureController.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/wpe/ScrollGestureController.cpp (modified) (4 diffs)
• UIProcess/API/wpe/ScrollGestureController.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-29  Chris Lord  <clord@igalia.com>
+
+        [WPE] Add axis-locking to kinetic scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=209729
+
+        Reviewed by Adrian Perez de Castro.
+
+        Add axis-locking to scroll gestures on WPE, and new WPE-specific
+        settings to control the process.
+
+        * UIProcess/API/wpe/ScrollGestureController.cpp:
+        (WebKit::ScrollGestureController::handleEvent):
+        * UIProcess/API/wpe/ScrollGestureController.h:
+
 2020-10-29  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.cpp

@@ -27 +27 @@
 #include "ScrollGestureController.h"
 
+#include "WebKitSettings.h"
 #include <WebCore/Scrollbar.h>
 
 namespace WebKit {
+
+// FIXME: These ought to be either configurable or derived from system
+//        properties, such as screen size and pixel density.
+static constexpr uint32_t scrollCaptureThreshold { 200 };
+static constexpr uint32_t axisLockMovementThreshold { 8 };
+static constexpr uint32_t axisLockActivationThreshold { 15 };
+static constexpr uint32_t axisLockReleaseThreshold { 30 };
 
 bool ScrollGestureController::handleEvent(const struct wpe_input_touch_event_raw* touchPoint)
@@ -40 +48 @@
         m_offset.x = touchPoint->x;
         m_offset.y = touchPoint->y;
+        m_xAxisLockBroken = false;
+        m_yAxisLockBroken = false;
         return false;
     case wpe_input_touch_event_type_motion:
@@ -50 +60 @@
             m_handling = std::abs(deltaX) >= pixelsPerLineStep
                 || std::abs(deltaY) >= pixelsPerLineStep
-                || deltaTime >= 200;
+                || deltaTime >= scrollCaptureThreshold;
         }
         if (m_handling) {
@@ -59 +69 @@
                 0, 0, 0,
             };
-            m_axisEvent.x_axis = -(m_offset.x - touchPoint->x);
-            m_axisEvent.y_axis = -(m_offset.y - touchPoint->y);
+
+            auto xOffset = std::abs(touchPoint->x - m_start.x);
+            auto yOffset = std::abs(touchPoint->y - m_start.y);
+
+            if (xOffset >= axisLockReleaseThreshold)
+                m_xAxisLockBroken = true;
+            if (yOffset >= axisLockReleaseThreshold)
+                m_yAxisLockBroken = true;
+
+            if (xOffset >= axisLockMovementThreshold && yOffset >= axisLockMovementThreshold && xOffset < axisLockActivationThreshold && yOffset < axisLockActivationThreshold) {
+                m_xAxisLockBroken = true;
+                m_yAxisLockBroken = true;
+            }
+
+            m_axisEvent.x_axis = (m_xAxisLockBroken || yOffset < axisLockActivationThreshold) ?  -(m_offset.x - touchPoint->x) : 0;
+            m_axisEvent.y_axis = (m_yAxisLockBroken || xOffset < axisLockActivationThreshold) ?  -(m_offset.y - touchPoint->y) : 0;
 #else
             m_axisEvent = {

trunk/Source/WebKit/UIProcess/API/wpe/ScrollGestureController.h

@@ -69 +69 @@
 #endif
     WebWheelEvent::Phase m_phase { WebWheelEvent::Phase::PhaseNone };
+
+    bool m_xAxisLockBroken { false };
+    bool m_yAxisLockBroken { false };
 };