Title: [289083] releases/WebKitGTK/webkit-2.34/Source/WebKit
- Revision
- 289083
- Author
- ape...@igalia.com
- Date
- 2022-02-03 15:14:43 -0800 (Thu, 03 Feb 2022)
Log Message
Merge r288809 - REGRESSION(r288644): [GTK4] Criticals when using pinch zoom
https://bugs.webkit.org/show_bug.cgi?id=235883
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseZoomBegin):
Only cancel the click gesture on GTK3. We don't use g_object_set_data() on GTK4.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.34/Source/WebKit/ChangeLog (289082 => 289083)
--- releases/WebKitGTK/webkit-2.34/Source/WebKit/ChangeLog 2022-02-03 23:13:21 UTC (rev 289082)
+++ releases/WebKitGTK/webkit-2.34/Source/WebKit/ChangeLog 2022-02-03 23:14:43 UTC (rev 289083)
@@ -1,3 +1,14 @@
+2022-01-31 Alexander Mikhaylenko <al...@gnome.org>
+
+ REGRESSION(r288644): [GTK4] Criticals when using pinch zoom
+ https://bugs.webkit.org/show_bug.cgi?id=235883
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseZoomBegin):
+ Only cancel the click gesture on GTK3. We don't use g_object_set_data() on GTK4.
+
2022-01-26 Alexander Mikhaylenko <al...@gnome.org>
[GTK3] Pinch zooming from a link activates it
Modified: releases/WebKitGTK/webkit-2.34/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (289082 => 289083)
--- releases/WebKitGTK/webkit-2.34/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2022-02-03 23:13:21 UTC (rev 289082)
+++ releases/WebKitGTK/webkit-2.34/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp 2022-02-03 23:14:43 UTC (rev 289083)
@@ -1833,8 +1833,10 @@
webkitWebViewBaseSynthesizeWheelEvent(webViewBase, event, 0, 0, x, y, WheelEventPhase::Began, WheelEventPhase::NoPhase, true);
+#if !USE(GTK4)
GtkGesture* click = GTK_GESTURE(g_object_get_data(G_OBJECT(webViewBase), "wk-view-multi-press-gesture"));
gtk_gesture_set_state(click, GTK_EVENT_SEQUENCE_DENIED);
+#endif
}
static void webkitWebViewBaseZoomChanged(WebKitWebViewBase* webViewBase, gdouble scale, GtkGesture* gesture)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
