Changeset 247862 in webkit

Timestamp:

Jul 26, 2019 2:00:32 AM (5 years ago)

Author:

commit-queue@webkit.org

Message:

REGRESSION(r246496): [GTK] Tapping the web view scrolls up a bit
​https://bugs.webkit.org/show_bug.cgi?id=200084

Patch by Alexander Mikhaylenko <​exalm7659@gmail.com> on 2019-07-26
Reviewed by Carlos Garcia Campos.

gdk_event_get_scroll_direction() returns false, but also sets direction to GDK_SCROLL_UP if
the direction was GDK_SCROLL_SMOOTH. Relying on zero deltas in this case is not correct, because
they can also be zero with GDK_SCROLL_SMOOTH. In this case, set the direction manually to avoid
that.

See ​https://gitlab.gnome.org/GNOME/gtk/issues/2048

Source/WebCore:

• platform/gtk/PlatformWheelEventGtk.cpp:

(WebCore::PlatformWheelEvent::PlatformWheelEvent):

Source/WebKit:

• Shared/gtk/WebEventFactory.cpp:

(WebKit::WebEventFactory::createWebWheelEvent):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/gtk/PlatformWheelEventGtk.cpp (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/gtk/WebEventFactory.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-26  Alexander Mikhaylenko  <exalm7659@gmail.com>
+
+        REGRESSION(r246496): [GTK] Tapping the web view scrolls up a bit
+        https://bugs.webkit.org/show_bug.cgi?id=200084
+
+        Reviewed by Carlos Garcia Campos.
+
+        gdk_event_get_scroll_direction() returns false, but also sets direction to GDK_SCROLL_UP if
+        the direction was GDK_SCROLL_SMOOTH. Relying on zero deltas in this case is not correct, because
+        they can also be zero with GDK_SCROLL_SMOOTH. In this case, set the direction manually to avoid
+        that.
+
+        See https://gitlab.gnome.org/GNOME/gtk/issues/2048
+
+        * platform/gtk/PlatformWheelEventGtk.cpp:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+
 2019-07-26  Rob Buis  <rbuis@igalia.com>
 

trunk/Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp

@@ -64 +64 @@
     GdkScrollDirection direction;
     if (!gdk_event_get_scroll_direction(reinterpret_cast<GdkEvent*>(event), &direction)) {
+        direction = GDK_SCROLL_SMOOTH;
         gdouble deltaX, deltaY;
         if (gdk_event_get_scroll_deltas(reinterpret_cast<GdkEvent*>(event), &deltaX, &deltaY)) {
@@ -85 +86 @@
         case GDK_SCROLL_RIGHT:
             m_deltaX = -delta;
+            break;
+        case GDK_SCROLL_SMOOTH:
             break;
         default:

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-07-26  Alexander Mikhaylenko  <exalm7659@gmail.com>
+
+        REGRESSION(r246496): [GTK] Tapping the web view scrolls up a bit
+        https://bugs.webkit.org/show_bug.cgi?id=200084
+
+        Reviewed by Carlos Garcia Campos.
+
+        gdk_event_get_scroll_direction() returns false, but also sets direction to GDK_SCROLL_UP if
+        the direction was GDK_SCROLL_SMOOTH. Relying on zero deltas in this case is not correct, because
+        they can also be zero with GDK_SCROLL_SMOOTH. In this case, set the direction manually to avoid
+        that.
+
+        See https://gitlab.gnome.org/GNOME/gtk/issues/2048
+
+        * Shared/gtk/WebEventFactory.cpp:
+        (WebKit::WebEventFactory::createWebWheelEvent):
+
 2019-07-26  Loïc Yhuel  <loic.yhuel@softathome.com>
 

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

@@ -206 +206 @@
     GdkScrollDirection direction;
     if (!gdk_event_get_scroll_direction(event, &direction)) {
+        direction = GDK_SCROLL_SMOOTH;
         double deltaX, deltaY;
         if (gdk_event_get_scroll_deltas(event, &deltaX, &deltaY))
@@ -224 +225 @@
         case GDK_SCROLL_RIGHT:
             wheelTicks = FloatSize(-1, 0);
+            break;
+        case GDK_SCROLL_SMOOTH:
             break;
         default: