Title: [205433] releases/WebKitGTK/webkit-2.12/Source/WebKit2
- Revision
- 205433
- Author
- carlo...@webkit.org
- Date
- 2016-09-05 01:49:07 -0700 (Mon, 05 Sep 2016)
Log Message
Merge r205182 - REGRESSION(r194846): [GTK] UI process crash visiting sites protected with HTTP auth when using GTK+ < 3.14
https://bugs.webkit.org/show_bug.cgi?id=161385
Reviewed by Antonio Gomes.
Since r194846, we are chaining up webkitWebViewBaseMotionNotifyEvent, but before GTK+ 3.14
GtkWidget::motion_notify_event was nullptr, so it can't be used unconditionally.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseMotionNotifyEvent):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog (205432 => 205433)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-09-05 08:31:11 UTC (rev 205432)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/ChangeLog 2016-09-05 08:49:07 UTC (rev 205433)
@@ -1,3 +1,16 @@
+2016-08-30 Carlos Garcia Campos <cgar...@igalia.com>
+
+ REGRESSION(r194846): [GTK] UI process crash visiting sites protected with HTTP auth when using GTK+ < 3.14
+ https://bugs.webkit.org/show_bug.cgi?id=161385
+
+ Reviewed by Antonio Gomes.
+
+ Since r194846, we are chaining up webkitWebViewBaseMotionNotifyEvent, but before GTK+ 3.14
+ GtkWidget::motion_notify_event was nullptr, so it can't be used unconditionally.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseMotionNotifyEvent):
+
2016-07-07 Alex Christensen <achristen...@webkit.org>
Followup to r202939.
Modified: releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (205432 => 205433)
--- releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-09-05 08:31:11 UTC (rev 205432)
+++ releases/WebKitGTK/webkit-2.12/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-09-05 08:49:07 UTC (rev 205433)
@@ -866,8 +866,10 @@
WebKitWebViewBase* webViewBase = WEBKIT_WEB_VIEW_BASE(widget);
WebKitWebViewBasePrivate* priv = webViewBase->priv;
- if (priv->authenticationDialog)
- return GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->motion_notify_event(widget, event);
+ if (priv->authenticationDialog) {
+ auto* widgetClass = GTK_WIDGET_CLASS(webkit_web_view_base_parent_class);
+ return widgetClass->motion_notify_event ? widgetClass->motion_notify_event(widget, event) : FALSE;
+ }
priv->pageProxy->handleMouseEvent(NativeWebMouseEvent(reinterpret_cast<GdkEvent*>(event), 0 /* currentClickCount */));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
