Title: [205182] trunk/Source/WebKit2
- Revision
- 205182
- Author
- [email protected]
- Date
- 2016-08-30 09:34:01 -0700 (Tue, 30 Aug 2016)
Log Message
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: trunk/Source/WebKit2/ChangeLog (205181 => 205182)
--- trunk/Source/WebKit2/ChangeLog 2016-08-30 15:06:19 UTC (rev 205181)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-30 16:34:01 UTC (rev 205182)
@@ -1,5 +1,18 @@
2016-08-30 Carlos Garcia Campos <[email protected]>
+ 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-08-30 Carlos Garcia Campos <[email protected]>
+
Unreviewed. Fix GTK+ build after r205150.
* UIProcess/API/gtk/WebKitUserContentManager.cpp:
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (205181 => 205182)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-08-30 15:06:19 UTC (rev 205181)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-08-30 16:34:01 UTC (rev 205182)
@@ -806,8 +806,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
