Add delay promise and change automation scripts

Also update the scroll an element into the view
as it may cause some internal div to scroll
and fail the test.

BUG=643215

Review-Url: https://codereview.chromium.org/2319133002
Cr-Commit-Position: refs/heads/master@{#417598}

third_party/WebKit/LayoutTests/TestExpectations

@@ -817,13 +817,13 @@ crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-pa
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-pan-down-css_touch-manual.html  [ Skip ]
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch-manual.html  [ Skip ]
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-pan-x-css_touch-manual.html  [ Skip ]
-#crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-button-test_touch-manual.html  [ Skip ]
-#crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-table-test_touch-manual.html  [ Skip ]
+crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-button-test_touch-manual.html  [ Skip ]
+crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-table-test_touch-manual.html  [ Skip ]
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch-manual.html  [ Skip ]
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-pan-y-css_touch-manual.html  [ Skip ]
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch-manual.html  [ Skip ]
-#crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-span-test_touch-manual.html  [ Skip ]
-#crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-svg-test_touch-manual.html  [ Skip ]
+crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-span-test_touch-manual.html  [ Skip ]
+crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-svg-test_touch-manual.html  [ Skip ]
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch-manual.html  [ Skip ]
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-none-css_touch-manual.html  [ Skip ]
 crbug.com/613672 [ Mac ] imported/wpt/pointerevents/pointerevent_touch-action-inherit_parent-none_touch-manual.html  [ Skip ]
@@ -837,12 +837,6 @@ crbug.com/613672 [ Mac ] virtual/scalefactor150/fast/events/synthetic-events/tap
 crbug.com/629722 imported/wpt/pointerevents/pointerevent_lostpointercapture_is_first-manual.html  [ Skip ]
 crbug.com/629722 imported/wpt/pointerevents/pointerevent_lostpointercapture_for_disconnected_node-manual.html  [ Skip ]
 
-# These tests are using timeouts and might be flaky sometimes
-crbug.com/643215 imported/wpt/pointerevents/pointerevent_touch-action-button-test_touch-manual.html  [ Skip ]
-crbug.com/643215 imported/wpt/pointerevents/pointerevent_touch-action-span-test_touch-manual.html  [ Skip ]
-crbug.com/643215 imported/wpt/pointerevents/pointerevent_touch-action-svg-test_touch-manual.html  [ Skip ]
-crbug.com/643215 imported/wpt/pointerevents/pointerevent_touch-action-table-test_touch-manual.html  [ Skip ]
-
 # There is no assoicated JS file to support automated user inputs.
 crbug.com/629724 imported/wpt/pointerevents/pointerevent_suppress_compat_events_on_click.html [ Skip ]
 crbug.com/629724 imported/wpt/pointerevents/pointerevent_suppress_compat_events_on_drag_mouse.html [ Skip ]

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_common_input.js

@@ -2,6 +2,20 @@
 
 const scrollOffset = 30;
 const boundaryOffset = 5;
+const touchSourceType = 1;
+
+function delayPromise(delay) {
+  return new Promise(function(resolve, reject) {
+    window.setTimeout(resolve, delay);
+  });
+}
+
+function scrollPageIfNeeded(targetSelector) {
+  var target = document.querySelector(targetSelector);
+  var targetRect = target.getBoundingClientRect();
+  if (targetRect.top < 0 || targetRect.left < 0 || targetRect.bottom > window.innerHeight || targetRect.right > window.innerWidth)
+    window.scrollTo(targetRect.left, targetRect.top);
+}
 
 // Mouse inputs.
 function mouseMoveToDocument() {
@@ -82,8 +96,8 @@ function mouseWheelScroll(direction) {
 function touchTapInTarget(targetSelector) {
   return new Promise(function(resolve, reject) {
     if (window.chrome && chrome.gpuBenchmarking) {
+      scrollPageIfNeeded(targetSelector);
       var target = document.querySelector(targetSelector);
-      target.scrollIntoViewIfNeeded();
       var targetRect = target.getBoundingClientRect();
       chrome.gpuBenchmarking.tap(targetRect.left + boundaryOffset, targetRect.top + boundaryOffset, function() {
         resolve();
@@ -97,12 +111,12 @@ function touchTapInTarget(targetSelector) {
 function touchScrollInTarget(targetSelector, direction) {
   return new Promise(function(resolve, reject) {
     if (window.chrome && chrome.gpuBenchmarking) {
+      scrollPageIfNeeded(targetSelector);
       var target = document.querySelector(targetSelector);
-      target.scrollIntoViewIfNeeded();
       var targetRect = target.getBoundingClientRect();
       chrome.gpuBenchmarking.smoothScrollBy(scrollOffset, function() {
         resolve();
-      }, targetRect.left + boundaryOffset, targetRect.top + boundaryOffset, 1, direction);
+      }, targetRect.left + boundaryOffset, targetRect.top + boundaryOffset, touchSourceType, direction);
     } else {
       reject();
     }
@@ -172,3 +186,4 @@ function keyboardScroll(direction) {
     pointerevent_automation.done();
   });
 }
+

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-button-test_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
-function callback_function() {
-  window.setTimeout(function() {
-    touchTapInTarget('btnComplete');}
-    , scrollReturnInterval);
-}
-
 function inject_input() {
-   var target = document.getElementById("target0");
-   var targetRect = target.getBoundingClientRect();
-
-   var button = document.getElementsByTagName("button")[0];
-   var buttonRect = button.getBoundingClientRect();
-
-   var x = (buttonRect.left - targetRect.left)/2;
-   touchScrollByPosition(x, targetRect.top + 100, 30, "down");
-   touchScrollByPosition(x, targetRect.top + 100, 30, "right", callback_function);
-
-   window.setTimeout(function() {
-    touchSmoothScrollUp(button);
-    touchSmoothScrollLeft(button, callback_function);
-    } , 4*scrollReturnInterval);
-}
+   return touchScrollInTarget('#target0', 'down').then(function() {
+    return touchScrollInTarget('#target0', 'right');
+  }).then(function() {
+    return delayPromise(4*scrollReturnInterval);
+  }).then(function() {
+    return touchScrollInTarget('#testButton', 'down');
+  }).then(function() {
+    return touchScrollInTarget('#testButton', 'right');
+  }).then(function() {
+    touchTapInTarget('#btnComplete');
+  });
+}
\ No newline at end of file

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-inherit_child-auto-child-none_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
 function inject_input() {
-  return touchScrollInTarget('#target0 > div > div > p', 'down').then(function() {
-    return touchScrollInTarget('#target0 > div > div > p', 'right');
+  return touchScrollInTarget('#target0 > div > div', 'down').then(function() {
+    return touchScrollInTarget('#target0 > div > div', 'right');
   }).then(function() {
     return touchTapInTarget('#btnComplete');
   });

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-inherit_child-none_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
 function inject_input() {
-  return touchScrollInTarget('#target0 > div > p', 'down').then(function() {
-    return touchScrollInTarget('#target0 > div > p', 'right');
+  return touchScrollInTarget('#target0 > div', 'down').then(function() {
+    return touchScrollInTarget('#target0 > div', 'right');
   }).then(function() {
     return touchTapInTarget('#btnComplete');
   });

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-x_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
 function inject_input() {
-  return touchScrollInTarget('#target0 > div > div > p', 'down').then(function() {
-    return touchScrollInTarget('#target0 > div > div > p', 'right');
+  return touchScrollInTarget('#target0 > div > div', 'down').then(function() {
+    return touchScrollInTarget('#target0 > div > div', 'right');
   }).then(function() {
     return touchTapInTarget('#btnComplete');
   });

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-inherit_child-pan-x-child-pan-y_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
 function inject_input() {
-  return touchScrollInTarget('#target0 > div > div > p', 'down').then(function() {
-    return touchScrollInTarget('#target0 > div > div > p', 'right');
+  return touchScrollInTarget('#target0 > div > div', 'down').then(function() {
+    return touchScrollInTarget('#target0 > div > div', 'right');
   }).then(function() {
     return touchTapInTarget('#btnComplete');
   });

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
 function inject_input() {
-  return touchScrollInTarget('#target0 > div > p', 'down').then(function() {
-    return touchScrollInTarget('#target0 > div > p', 'right');
+  return touchScrollInTarget('#target0 > div', 'down').then(function() {
+    return touchScrollInTarget('#target0 > div', 'right');
   });
 }
 

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-inherit_parent-none_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
 function inject_input() {
-  return touchScrollInTarget('#target0 > div > p', 'down').then(function() {
-    return touchScrollInTarget('#target0 > div > p', 'right');
+  return touchScrollInTarget('#target0 > div', 'down').then(function() {
+    return touchScrollInTarget('#target0 > div', 'right');
   }).then(function() {
     return touchTapInTarget('#btnComplete');
   });

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-pan-x-pan-y-pan-y_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
 function inject_input() {
-  return touchScrollInTarget('#target0 > div > div > p', 'down').then(function() {
-    return touchScrollInTarget('#target0 > div > div > p', 'right');
+  return touchScrollInTarget('#target0 > div > div', 'down').then(function() {
+    return touchScrollInTarget('#target0 > div > div', 'right');
   }).then(function() {
     return touchTapInTarget('#btnComplete');
   });

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-span-test_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
-function callback_function() {
-  touchTapInTarget('btnComplete');
-}
-
 function inject_input() {
-   var target = document.getElementById("target0");
-   var targetRect = target.getBoundingClientRect();
-
-   var span = document.getElementsByTagName("span")[0];
-   var spanRect = span.getBoundingClientRect();
-
-   var x = (spanRect.left - targetRect.left)/2;
-   touchScrollByPosition(x, targetRect.top + 100, 30, "down");
-   touchScrollByPosition(x, targetRect.top + 100, 30, "right");
-
-   window.setTimeout(function() {
-    touchSmoothScrollUp(span);
-    touchSmoothScrollLeft(span, callback_function);
-    } , 6*scrollReturnInterval);
-}
+   return touchScrollInTarget('#target0', 'down').then(function() {
+    return touchScrollInTarget('#target0', 'right');
+  }).then(function() {
+    return delayPromise(4*scrollReturnInterval);
+  }).then(function() {
+    return touchScrollInTarget('#target0 > span', 'down');
+  }).then(function() {
+    return touchScrollInTarget('#target0 > span', 'right');
+  }).then(function() {
+    touchTapInTarget('#btnComplete');
+  });
+}
\ No newline at end of file

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-svg-test_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
-function callback_function() {
-  touchTapInTarget('btnComplete');
-}
-
 function inject_input() {
-   var target = document.getElementById("target0");
-   var targetRect = target.getBoundingClientRect();
-
-   var svg = document.getElementsByTagName("svg")[0];
-   var svgRect = svg.getBoundingClientRect();
-
-   var x = (svgRect.left - targetRect.left)/2;
-   touchScrollByPosition(x, targetRect.top + 100, 30, "down");
-   touchScrollByPosition(x, targetRect.top + 100, 30, "right");
-
-   window.setTimeout(function() {
-     touchSmoothScrollUp(svg);
-     touchSmoothScrollLeft(svg, callback_function);
-     } , 4*scrollReturnInterval);
-}
+   return touchScrollInTarget('#target0', 'down').then(function() {
+    return touchScrollInTarget('#target0', 'right');
+  }).then(function() {
+    return delayPromise(4*scrollReturnInterval);
+  }).then(function() {
+    return touchScrollInTarget('#target0 > svg', 'down');
+  }).then(function() {
+    return touchScrollInTarget('#target0 > svg', 'right');
+  }).then(function() {
+    touchTapInTarget('#btnComplete');
+  });
+}
\ No newline at end of file

third_party/WebKit/LayoutTests/imported/wpt_automation/pointerevents/pointerevent_touch-action-table-test_touch-manual-automation.js

 importAutomationScript('/pointerevents/pointerevent_common_input.js');
 
 function inject_input() {
-  touchScrollInTarget('row1', 'down');
-  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);
+   return touchScrollInTarget('#row1', 'down').then(function() {
+    return touchScrollInTarget('#row1', 'right');
+  }).then(function() {
+    return delayPromise(4*scrollReturnInterval);
+  }).then(function() {
+    return touchScrollInTarget('#cell3', 'down');
+  }).then(function() {
+    return touchScrollInTarget('#cell3', 'right');
+  }).then(function() {
+    touchTapInTarget('#btnComplete');
+  });
 }