Index: third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-table-test_touch-manual-automation.js |
diff --git a/third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-table-test_touch-manual-automation.js b/third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-table-test_touch-manual-automation.js |
index b1d4bb6c280546cecba56d871b30a73108bafec1..fe32faef42df9cc04c3040bcd8933aa55b7e2aa9 100644 |
--- a/third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-table-test_touch-manual-automation.js |
+++ b/third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-table-test_touch-manual-automation.js |
@@ -1,22 +1,15 @@ |
importAutomationScript('/pointerevents/pointerevent_common_input.js'); |
-function callback_function() { |
- window.setTimeout(function() { |
- touchTapInTarget('btnComplete');} |
- , 2 * scrollReturnInterval); |
-} |
- |
function inject_input() { |
- touchScrollUpInTarget('row1'); |
- window.setTimeout(function() { |
- touchScrollLeftInTarget('row1'); |
- } , 2*scrollReturnInterval); |
- |
- window.setTimeout(function() { |
- touchScrollUpInTarget('cell3'); |
- } , 2*scrollReturnInterval); |
- |
- window.setTimeout(function() { |
- touchScrollLeftInTarget('cell3', callback_function); |
- } , 2*scrollReturnInterval); |
-} |
+ touchScrollInTarget('row1', 'down'); |
mustaq
2016/08/17 15:59:22
The top two Promises are handled differently from
Navid Zolghadr
2016/08/17 16:11:41
The old way was incorrect. It was queuing all the
|
+ window.setTimeout(function() { |
+ touchScrollInTarget('row1', 'right'); |
+ window.setTimeout(function() { |
+ touchScrollInTarget('cell3', 'down').then(function() { |
+ return touchScrollInTarget('cell3', 'right'); |
+ }).then(function() { |
+ touchTapInTarget('btnComplete'); |
+ }); |
+ } , 2 * scrollReturnInterval); |
+ } , 2 * scrollReturnInterval); |
+} |