Title: [213056] releases/WebKitGTK/webkit-2.16/Tools
Revision
213056
Author
carlo...@webkit.org
Date
2017-02-27 06:24:58 -0800 (Mon, 27 Feb 2017)

Log Message

Merge r212839 - [GTK] Do not use g_return_if_fail in EventSenderProxy::continuousMouseScrollBy
https://bugs.webkit.org/show_bug.cgi?id=168721

Patch by Carlos Garcia Campos <cgar...@igalia.com> on 2017-02-22
Reviewed by Michael Catanzaro.

Use WTFLogAlways instead. It's still shown in stderr, but it won't crash if we ever run tests with fatal
criticals.

* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
(WTR::EventSenderProxy::continuousMouseScrollBy):

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.16/Tools/ChangeLog (213055 => 213056)


--- releases/WebKitGTK/webkit-2.16/Tools/ChangeLog	2017-02-27 14:21:50 UTC (rev 213055)
+++ releases/WebKitGTK/webkit-2.16/Tools/ChangeLog	2017-02-27 14:24:58 UTC (rev 213056)
@@ -1,3 +1,16 @@
+2017-02-22  Carlos Garcia Campos  <cgar...@igalia.com>
+
+        [GTK] Do not use g_return_if_fail in EventSenderProxy::continuousMouseScrollBy
+        https://bugs.webkit.org/show_bug.cgi?id=168721
+
+        Reviewed by Michael Catanzaro.
+
+        Use WTFLogAlways instead. It's still shown in stderr, but it won't crash if we ever run tests with fatal
+        criticals.
+
+        * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+        (WTR::EventSenderProxy::continuousMouseScrollBy):
+
 2017-02-20  Filip Pizlo  <fpi...@apple.com>
 
         The collector thread should only start when the mutator doesn't have heap access

Modified: releases/WebKitGTK/webkit-2.16/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp (213055 => 213056)


--- releases/WebKitGTK/webkit-2.16/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp	2017-02-27 14:21:50 UTC (rev 213055)
+++ releases/WebKitGTK/webkit-2.16/Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp	2017-02-27 14:24:58 UTC (rev 213056)
@@ -441,7 +441,10 @@
 void EventSenderProxy::continuousMouseScrollBy(int horizontal, int vertical, bool paged)
 {
     // Gtk+ does not support paged scroll events.
-    g_return_if_fail(!paged);
+    if (paged) {
+        WTFLogAlways("EventSenderProxy::continuousMouseScrollBy not implemented for paged scroll events");
+        return;
+    }
 
     GdkEvent* event = gdk_event_new(GDK_SCROLL);
     event->scroll.x = m_position.x;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to