Attachment 361011 Details for Bug 194201 – Patch

[patch] Patch

bug-194201-20190203184349.patch (text/plain), 2.71 KB, created by Alice Mikhaylenko on 2019-02-03 05:43:51 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alice Mikhaylenko

Created: 2019-02-03 05:43:51 PST

Size: 2.71 KB

patch

obsolete

>Subversion Revision: 240902
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index b9678c2c237af05a5249f83ce17bd38313d84c0e..2e21d31e3aa3167eaa1b98024388bca56dc8c6e4 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-02-03  Alexander Mikhaylenko  <exalm7659@gmail.com>
>+
>+        [GTK] Allow pinch zoom on touchpad
>+        https://bugs.webkit.org/show_bug.cgi?id=194201
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Enable touchpad events for WebkitWebViewBase, then feed touchpad
>+        pinch events to GestureController.
>+
>+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
>+        (webkitWebViewBaseRealize): Added GDK_TOUCHPAD_GESTURE_MASK to event mask.
>+        (webkitWebViewBaseEvent): Added.
>+        (webkit_web_view_base_class_init): Override event vfunc.
>+
> 2019-02-03  Megan Gardner  <megan_gardner@apple.com>
> 
>         Turn on Smart Paste
>diff --git a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>index e224a1e65735e043ed2ce76ae1b6579e5c90ae73..61ca9b921dcb5cc2a361a46b96627c4944f07ad2 100644
>--- a/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>+++ b/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp
>@@ -363,7 +363,8 @@ static void webkitWebViewBaseRealize(GtkWidget* widget)
>         | GDK_BUTTON1_MOTION_MASK
>         | GDK_BUTTON2_MOTION_MASK
>         | GDK_BUTTON3_MOTION_MASK
>-        | GDK_TOUCH_MASK;
>+        | GDK_TOUCH_MASK
>+        | GDK_TOUCHPAD_GESTURE_MASK;
> 
>     gint attributesMask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
> 
>@@ -1192,6 +1193,17 @@ static void webkitWebViewBaseDragDataReceived(GtkWidget* widget, GdkDragContext*
> }
> #endif // ENABLE(DRAG_SUPPORT)
> 
>+static gboolean webkitWebViewBaseEvent(GtkWidget* widget, GdkEvent* event)
>+{
>+    if (event->type == GDK_TOUCHPAD_PINCH) {
>+        WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
>+        GestureController& controller = webkitWebViewBaseGestureController(webViewBase);
>+        controller.handleEvent(event);
>+    }
>+
>+    return GDK_EVENT_PROPAGATE;
>+}
>+
> static AtkObject* webkitWebViewBaseGetAccessible(GtkWidget* widget)
> {
>     // If the socket has already been created and embedded a plug ID, return it.
>@@ -1315,6 +1327,7 @@ static void webkit_web_view_base_class_init(WebKitWebViewBaseClass* webkitWebVie
>     widgetClass->drag_drop = webkitWebViewBaseDragDrop;
>     widgetClass->drag_data_received = webkitWebViewBaseDragDataReceived;
> #endif // ENABLE(DRAG_SUPPORT)
>+    widgetClass->event = webkitWebViewBaseEvent;
>     widgetClass->get_accessible = webkitWebViewBaseGetAccessible;
>     widgetClass->hierarchy_changed = webkitWebViewBaseHierarchyChanged;
>     widgetClass->destroy = webkitWebViewBaseDestroy;

Actions: View | Formatted Diff | Diff

Attachments on bug 194201: 361011 | 361023 | 361028 | 361030