Changeset 269143 in webkit

Timestamp:

Oct 29, 2020, 4:23:45 AM (6 years ago)

Author:

Chris Lord

Message:

[GTK] Smooth scrolling should not apply to continuous scrolling with sync scrolling
​https://bugs.webkit.org/show_bug.cgi?id=218133

Reviewed by Adrian Perez de Castro.

Source/WebCore:

Respect PlatformWheelEvent.hasPreciseScrollingDeltas in the base
ScrollAnimator class, and make sure the flag is set correctly for
GdkEvent.

• SourcesGTK.txt:
• platform/PlatformWheelEvent.h:

(WebCore::PlatformWheelEvent::setHasPreciseScrollingDeltas):

• platform/ScrollAnimator.cpp:

(WebCore::ScrollAnimator::scroll):
(WebCore::ScrollAnimator::scrollWithoutAnimation):
(WebCore::ScrollAnimator::handleWheelEvent):

• platform/ScrollAnimator.h:
• platform/gtk/GtkVersioning.h:

(gdk_event_get_source_device):

• platform/gtk/PlatformWheelEventGtk.cpp: Removed.

Source/WebKit:

Set hasPreciseScrollDeltas appropriately on scroll events created from GdkEvent.

• Shared/gtk/WebEventFactory.cpp:

(WebKit::WebEventFactory::createWebWheelEvent):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/SourcesGTK.txt (modified) (1 diff)
• WebCore/platform/PlatformWheelEvent.h (modified) (3 diffs)
• WebCore/platform/ScrollAnimator.cpp (modified) (3 diffs)
• WebCore/platform/ScrollAnimator.h (modified) (1 diff)
• WebCore/platform/gtk/GtkVersioning.h (modified) (1 diff)
• WebCore/platform/gtk/PlatformWheelEventGtk.cpp (deleted)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/gtk/WebEventFactory.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-29  Chris Lord  <clord@igalia.com>
+
+        [GTK] Smooth scrolling should not apply to continuous scrolling with sync scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=218133
+
+        Reviewed by Adrian Perez de Castro.
+
+        Respect PlatformWheelEvent.hasPreciseScrollingDeltas in the base
+        ScrollAnimator class, and make sure the flag is set correctly for
+        GdkEvent.
+
+        * SourcesGTK.txt:
+        * platform/PlatformWheelEvent.h:
+        (WebCore::PlatformWheelEvent::setHasPreciseScrollingDeltas):
+        * platform/ScrollAnimator.cpp:
+        (WebCore::ScrollAnimator::scroll):
+        (WebCore::ScrollAnimator::scrollWithoutAnimation):
+        (WebCore::ScrollAnimator::handleWheelEvent):
+        * platform/ScrollAnimator.h:
+        * platform/gtk/GtkVersioning.h:
+        (gdk_event_get_source_device):
+        * platform/gtk/PlatformWheelEventGtk.cpp: Removed.
+
 2020-10-29  Cathie Chen  <cathiechen@igalia.com>
 

trunk/Source/WebCore/SourcesGTK.txt

@@ -113 +113 @@
 platform/gtk/PlatformKeyboardEventGtk.cpp
 platform/gtk/PlatformScreenGtk.cpp
-platform/gtk/PlatformWheelEventGtk.cpp
 platform/gtk/RenderThemeGadget.cpp
 platform/gtk/RenderThemeScrollbar.cpp

trunk/Source/WebCore/platform/PlatformWheelEvent.h

@@ -31 +31 @@
 #include <wtf/WindowsExtras.h>
 
-#if PLATFORM(GTK)
-typedef struct _GdkEventScroll GdkEventScroll;
-#endif
-
 namespace WTF {
 class TextStream;
@@ -138 +134 @@
     const FloatSize& scrollingVelocity() const { return m_scrollingVelocity; }
 
-#if PLATFORM(GTK)
-    explicit PlatformWheelEvent(GdkEventScroll*);
-#endif
-
-#if PLATFORM(COCOA) || PLATFORM(GTK) || USE(LIBWPE)
     bool hasPreciseScrollingDeltas() const { return m_hasPreciseScrollingDeltas; }
     void setHasPreciseScrollingDeltas(bool hasPreciseScrollingDeltas) { m_hasPreciseScrollingDeltas = hasPreciseScrollingDeltas; }
-#endif
 
 #if PLATFORM(COCOA)
@@ -197 +187 @@
     PlatformWheelEventPhase m_momentumPhase { PlatformWheelEventPhaseNone };
 #endif
-#if PLATFORM(COCOA) || PLATFORM(GTK) || USE(LIBWPE)
     bool m_hasPreciseScrollingDeltas { false };
-#endif
 #if PLATFORM(COCOA)
     unsigned m_scrollCount { 0 };

trunk/Source/WebCore/platform/ScrollAnimator.cpp

@@ -81 +81 @@
 }
 
-bool ScrollAnimator::scroll(ScrollbarOrientation orientation, ScrollGranularity, float step, float multiplier)
+bool ScrollAnimator::scroll(ScrollbarOrientation orientation, ScrollGranularity granularity, float step, float multiplier)
+{
+    return scrollWithoutAnimation(orientation, granularity, step, multiplier);
+}
+
+bool ScrollAnimator::scrollWithoutAnimation(ScrollbarOrientation orientation, ScrollGranularity, float step, float multiplier)
 {
     FloatPoint currentPosition = this->currentPosition();
@@ -177 +182 @@
                     deltaY = -deltaY;
             }
-            scroll(VerticalScrollbar, granularity, verticalScrollbar->pixelStep(), -deltaY);
+            if (e.hasPreciseScrollingDeltas())
+                scrollWithoutAnimation(VerticalScrollbar, granularity, verticalScrollbar->pixelStep(), -deltaY);
+            else
+                scroll(VerticalScrollbar, granularity, verticalScrollbar->pixelStep(), -deltaY);
         }
 
@@ -187 +195 @@
                     deltaX = -deltaX;
             }
-            scroll(HorizontalScrollbar, granularity, horizontalScrollbar->pixelStep(), -deltaX);
+            if (e.hasPreciseScrollingDeltas())
+                scrollWithoutAnimation(HorizontalScrollbar, granularity, horizontalScrollbar->pixelStep(), -deltaX);
+            else
+                scroll(HorizontalScrollbar, granularity, horizontalScrollbar->pixelStep(), -deltaX);
         }
     }

trunk/Source/WebCore/platform/ScrollAnimator.h

@@ -73 +73 @@
     // The base class implementation always scrolls immediately, never animates.
     virtual bool scroll(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
+    bool scrollWithoutAnimation(ScrollbarOrientation, ScrollGranularity, float step, float multiplier);
 
     void scrollToOffset(const FloatPoint&);

trunk/Source/WebCore/platform/gtk/GtkVersioning.h

@@ -81 +81 @@
 }
 
+static inline GdkDevice*
+gdk_event_get_source_device(const GdkEvent* event)
+{
+    return gdk_event_get_device(event);
+}
+
 static inline void
 gtk_widget_size_allocate(GtkWidget* widget, GtkAllocation* allocation)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-10-29  Chris Lord  <clord@igalia.com>
+
+        [GTK] Smooth scrolling should not apply to continuous scrolling with sync scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=218133
+
+        Reviewed by Adrian Perez de Castro.
+
+        Set hasPreciseScrollDeltas appropriately on scroll events created from GdkEvent.
+
+        * Shared/gtk/WebEventFactory.cpp:
+        (WebKit::WebEventFactory::createWebWheelEvent):
+
 2020-10-28  John Wilander  <wilander@apple.com>
 

trunk/Source/WebKit/Shared/gtk/WebEventFactory.cpp

@@ -281 +281 @@
     FloatSize delta(wheelTicks.width() * step, wheelTicks.height() * step);
 
+    bool hasPreciseScrollingDeltas = false;
+    GdkScrollDirection direction;
+    if (!gdk_event_get_scroll_direction(event, &direction)) {
+        double deltaX, deltaY;
+        if (gdk_event_get_scroll_deltas(event, &deltaX, &deltaY)) {
+            if (auto* device = gdk_event_get_source_device(event))
+                hasPreciseScrollingDeltas = gdk_device_get_source(device) != GDK_SOURCE_MOUSE;
+        }
+    }
+
     return WebWheelEvent(WebEvent::Wheel,
         position,
@@ -289 +299 @@
         momentumPhase,
         WebWheelEvent::ScrollByPixelWheelEvent,
-        false,
+        hasPreciseScrollingDeltas,
         modifiersForEvent(event),
         wallTimeForEvent(event));