Title: [197351] trunk
- Revision
- 197351
- Author
- commit-qu...@webkit.org
- Date
- 2016-02-29 07:01:55 -0800 (Mon, 29 Feb 2016)
Log Message
[GTK] Touch slider test fails due to assertion in webkitWebViewBaseTouchEvent()
https://bugs.webkit.org/show_bug.cgi?id=153829
Patch by Adrien Plazas <apla...@igalia.com> on 2016-02-29
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
Once a touch event sequence is identified as a gesture, remove it
from the list of handled touch events.
* UIProcess/API/gtk/WebKitWebViewBase.cpp:
(webkitWebViewBaseTouchEvent):
LayoutTests:
* platform/gtk/TestExpectations:
Remove now passing tests from the expected failures.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (197350 => 197351)
--- trunk/LayoutTests/ChangeLog 2016-02-29 14:59:39 UTC (rev 197350)
+++ trunk/LayoutTests/ChangeLog 2016-02-29 15:01:55 UTC (rev 197351)
@@ -1,3 +1,13 @@
+2016-02-29 Adrien Plazas <apla...@igalia.com>
+
+ [GTK] Touch slider test fails due to assertion in webkitWebViewBaseTouchEvent()
+ https://bugs.webkit.org/show_bug.cgi?id=153829
+
+ Reviewed by Carlos Garcia Campos.
+
+ * platform/gtk/TestExpectations:
+ Remove now passing tests from the expected failures.
+
2016-02-28 Antti Koivisto <an...@apple.com>
::slotted doesn't work in nested shadow trees
Modified: trunk/LayoutTests/platform/gtk/TestExpectations (197350 => 197351)
--- trunk/LayoutTests/platform/gtk/TestExpectations 2016-02-29 14:59:39 UTC (rev 197350)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2016-02-29 15:01:55 UTC (rev 197351)
@@ -419,7 +419,6 @@
webkit.org/b/128172 fast/events/touch/basic-multi-touch-events-limited.html [ Failure ]
webkit.org/b/128172 fast/events/touch/basic-multi-touch-events.html [ Failure ]
webkit.org/b/128172 fast/events/touch/touch-input-element-change-documents.html [ Failure Timeout ]
-webkit.org/b/128172 fast/events/touch/frame-hover-update.html [ Failure ]
webkit.org/b/128172 fast/events/touch/multi-touch-grouped-targets.html [ Timeout Failure ]
webkit.org/b/128172 fast/events/touch/multi-touch-inside-nested-iframes.html [ Crash Timeout ]
webkit.org/b/128172 fast/events/touch/multi-touch-inside-iframes.html [ Timeout ]
@@ -1511,7 +1510,6 @@
# This tests timeout since the upgrade of GTK to 3.16 and Cairo to 1.14 on the JHBuild
webkit.org/b/146731 fast/events/touch/tap-highlight-color.html [ Timeout ]
webkit.org/b/146731 fast/events/touch/touch-scaled-scrolled.html [ Timeout ]
-webkit.org/b/146731 fast/events/touch/touch-stale-node-crash.html [ Timeout ]
webkit.org/b/153061 [ Release ] imported/w3c/indexeddb/idbindex-multientry-big.htm [ Timeout ]
Modified: trunk/Source/WebKit2/ChangeLog (197350 => 197351)
--- trunk/Source/WebKit2/ChangeLog 2016-02-29 14:59:39 UTC (rev 197350)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-29 15:01:55 UTC (rev 197351)
@@ -1,3 +1,16 @@
+2016-02-29 Adrien Plazas <apla...@igalia.com>
+
+ [GTK] Touch slider test fails due to assertion in webkitWebViewBaseTouchEvent()
+ https://bugs.webkit.org/show_bug.cgi?id=153829
+
+ Reviewed by Carlos Garcia Campos.
+
+ Once a touch event sequence is identified as a gesture, remove it
+ from the list of handled touch events.
+
+ * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+ (webkitWebViewBaseTouchEvent):
+
2016-02-29 Csaba Osztrogonác <o...@webkit.org>
[Mac][cmake] Unreviewed buildfix after r197177. Just for fun.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (197350 => 197351)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-02-29 14:59:39 UTC (rev 197350)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-02-29 15:01:55 UTC (rev 197351)
@@ -947,6 +947,7 @@
return TRUE;
GdkEvent* touchEvent = reinterpret_cast<GdkEvent*>(event);
+ uint32_t sequence = GPOINTER_TO_UINT(gdk_event_get_event_sequence(touchEvent));
#if HAVE(GTK_GESTURES)
GestureController& gestureController = webkitWebViewBaseGestureController(webViewBase);
@@ -954,11 +955,14 @@
// If we are already processing gestures is because the WebProcess didn't handle the
// BEGIN touch event, so pass subsequent events to the GestureController.
gestureController.handleEvent(touchEvent);
+ // Remove the gesture event sequence from the handled touch events
+ // list to avoid the gesure sequence and a touch sequence of same
+ // ID to conflict.
+ priv->touchEvents.remove(sequence);
return TRUE;
}
#endif
- uint32_t sequence = GPOINTER_TO_UINT(gdk_event_get_event_sequence(touchEvent));
switch (touchEvent->type) {
case GDK_TOUCH_BEGIN: {
ASSERT(!priv->touchEvents.contains(sequence));
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
