Revert "Use testdriver Action API in WPT pointerevent touch tests"

This reverts commit 6cf9dcc6.

Reason for revert: Looks like this caused pointer event tests to fail in Linux Trusty:

https://ci.chromium.org/p/chromium/builders/luci.chromium.ci/WebKit%20Linux%20Trusty%20Leak/30147

Original change's description:
> Use testdriver Action API in WPT pointerevent touch tests
> 
> In order to run the web-platform-tests automatically, we will use
> testdriver Action API in all the wpt to simulate inputs. Here we are
> changing some pointerevent touch input tests which are doing scrolling.
> 
> Bug: 606367
> Change-Id: Ibdabcbb973ac641174ca6faadccd737fa8c678b4
> Reviewed-on: https://chromium-review.googlesource.com/c/1461504
> Reviewed-by: Navid Zolghadr <nzolghadr@chromium.org>
> Commit-Queue: Lan Wei <lanwei@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#632251}

TBR=lanwei@chromium.org,nzolghadr@chromium.org

Change-Id: If3d25e3e679ad345c6a3566d2bf6a0a962ba5568
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 606367
Reviewed-on: https://chromium-review.googlesource.com/c/1473973Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#632300}

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_change-touch-action-onpointerdown_touch.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual.html

@@ -6,9 +6,6 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script src="/resources/testdriver.js"></script>
-        <script src="/resources/testdriver-actions.js"></script>
-        <script src="/resources/testdriver-vendor.js"></script>
         <script src="pointerevent_support.js"></script>
         <style>
             #target0 {
@@ -127,9 +124,6 @@
                 on_event(target0, 'pointerup', function(event) {
                     firstTouchCompleted = true;
                 });
-
-                // Inject touch inputs.
-                touchScrollInTarget(target0, 'down');
             }
         </script>
         <h1>touch-action: auto to none</h1>

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_pointercancel_touch.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_pointercancel_touch-manual.html

@@ -5,9 +5,6 @@
         <meta name="viewport" content="width=device-width">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script src="/resources/testdriver.js"></script>
-        <script src="/resources/testdriver-actions.js"></script>
-        <script src="/resources/testdriver-vendor.js"></script>
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <!-- Additional helper script for common checks across event types -->
         <script type="text/javascript" src="pointerevent_support.js"></script>
@@ -69,9 +66,6 @@
                     });
                     test_pointerEvent.done();
                 });
-
-                // Inject touch inputs.
-                touchScrollInTarget(target0, 'down');
             }
         </script>
         <h1>Pointer Events pointercancel Tests</h1>

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_pointerleave_after_pointercancel_touch.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_pointerleave_after_pointercancel_touch-manual.html

@@ -6,9 +6,6 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script src="/resources/testdriver.js"></script>
-        <script src="/resources/testdriver-actions.js"></script>
-        <script src="/resources/testdriver-vendor.js"></script>
         <!-- Additional helper script for common checks across event types -->
         <script type="text/javascript" src="pointerevent_support.js"></script>
     </head>
@@ -57,9 +54,6 @@
                         }
                     }
                 });
-
-                // Inject touch inputs.
-                touchScrollInTarget(target0, 'down');
             }
 
         </script>

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_pointerout_after_pointercancel_touch.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_pointerout_after_pointercancel_touch-manual.html

@@ -6,9 +6,6 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script src="/resources/testdriver.js"></script>
-        <script src="/resources/testdriver-actions.js"></script>
-        <script src="/resources/testdriver-vendor.js"></script>
         <!-- Additional helper script for common checks across event types -->
         <script type="text/javascript" src="pointerevent_support.js"></script>
     </head>
@@ -58,9 +55,6 @@
                         }
                     }
                 });
-
-                // Inject touch inputs.
-                touchScrollInTarget(target0, 'down');
             }
 
         </script>

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual.html

@@ -6,9 +6,6 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script src="/resources/testdriver.js"></script>
-        <script src="/resources/testdriver-actions.js"></script>
-        <script src="/resources/testdriver-vendor.js"></script>
         <script src="pointerevent_support.js"></script>
     </head>
     <body class="scrollable">
@@ -67,9 +64,6 @@
                     event_log.push('pointercancel@target0');
                     pointercancelGot = true;
                 });
-
-                // Inject touch inputs.
-                touchScrollInTarget(target0, 'down');
             }
         </script>
         <h1>Pointer Events Capture Test</h1>

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_support.js

@@ -252,35 +252,3 @@ function setup_pointerevent_test(testName, supportedPointerTypes) {
 function checkPointerEventType(event) {
     assert_equals(event.pointerType, expectedPointerType, "pointerType should be the same as the requested device.");
 }
-
-function touchScrollInTarget(target, direction) {
-    var x_delta = 0;
-    var y_delta = 0;
-    if (direction == "down") {
-        x_delta = 0;
-        y_delta = -10;
-    } else if (direction == "up") {
-        x_delta = 0;
-        y_delta = 10;
-    } else if (direction == "right") {
-        x_delta = -10;
-        y_delta = 0;
-    } else if (direction == "left") {
-        x_delta = 10;
-        y_delta = 0;
-    } else {
-        throw("scroll direction '" + direction + "' is not expected, direction should be 'down', 'up', 'left' or 'right'");
-    }
-    return new test_driver.Actions()
-                   .addPointer("pointer1", "touch")
-                   .pointerMove(0, 0, {origin: target})
-                   .pointerDown()
-                   .pointerMove(x_delta, y_delta, {origin: target})
-                   .pointerMove(2 * x_delta, 2 * y_delta, {origin: target})
-                   .pointerMove(3 * x_delta, 3 * y_delta, {origin: target})
-                   .pointerMove(4 * x_delta, 4 * y_delta, {origin: target})
-                   .pointerMove(5 * x_delta, 5 * y_delta, {origin: target})
-                   .pointerMove(6 * x_delta, 6 * y_delta, {origin: target})
-                   .pointerUp()
-                   .send();
-}

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_touch-action-auto-css_touch.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_touch-action-auto-css_touch-manual.html

@@ -6,9 +6,6 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script src="/resources/testdriver.js"></script>
-        <script src="/resources/testdriver-actions.js"></script>
-        <script src="/resources/testdriver-vendor.js"></script>
         <script src="pointerevent_support.js"></script>
         <style>
             #target0 {
@@ -121,10 +118,6 @@
                         updateDescriptionComplete();
                     }
                 });
-
-                // Inject touch inputs.
-                touchScrollInTarget(target0, 'down').then(function() {
-                    return touchScrollInTarget(target0, 'right'); });
             }
         </script>
         <h1>touch-action: auto</h1>

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_touch-action-inherit_highest-parent-none_touch-manual.html

@@ -6,9 +6,6 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script src="/resources/testdriver.js"></script>
-        <script src="/resources/testdriver-actions.js"></script>
-        <script src="/resources/testdriver-vendor.js"></script>
         <script src="pointerevent_support.js"></script>
         <style>
             #divParent {
@@ -121,10 +118,6 @@
                         updateDescriptionComplete();
                     }
                 });
-
-                // Inject touch inputs.
-                touchScrollInTarget(scrollTarget, 'down').then(function() {
-                    return touchScrollInTarget(scrollTarget, 'right'); });
             }
 
             function enableScrolling() {

third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch.html → third_party/blink/web_tests/external/wpt/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch-manual.html

@@ -6,9 +6,6 @@
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
-        <script src="/resources/testdriver.js"></script>
-        <script src="/resources/testdriver-actions.js"></script>
-        <script src="/resources/testdriver-vendor.js"></script>
         <script src="pointerevent_support.js"></script>
         <style>
             #target0 {
@@ -118,10 +115,6 @@
                         updateDescriptionComplete();
                     }
                 });
-
-                // Inject touch inputs.
-                touchScrollInTarget(target0, 'down').then(function() {
-                    return touchScrollInTarget(target0, 'right'); });
             }
         </script>
         <h1>touch-action: pan-x pan-y</h1>

third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_change-touch-action-onpointerdown_touch-manual-automation.js

+importAutomationScript('/pointerevents/pointerevent_common_input.js');
+
+function inject_input() {
+  return touchScrollInTarget('#target0', 'down');
+}
+

third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_pointercancel_touch-manual-automation.js

+importAutomationScript('/pointerevents/pointerevent_common_input.js');
+
+function inject_input() {
+  return touchScrollInTarget('#target0', 'down');
+}
+
+

third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_pointerleave_after_pointercancel_touch-manual-automation.js

+importAutomationScript('/pointerevents/pointerevent_common_input.js');
+
+function inject_input() {
+  return touchScrollInTarget('#target0', 'down');
+}
+
+

third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_pointerout_after_pointercancel_touch-manual-automation.js

+importAutomationScript('/pointerevents/pointerevent_common_input.js');
+
+function inject_input() {
+  return touchScrollInTarget('#target0', 'down');
+}
+

third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_releasepointercapture_onpointercancel_touch-manual-automation.js

+importAutomationScript('/pointerevents/pointerevent_common_input.js');
+
+function inject_input() {
+  return touchScrollInTarget('#target0', 'down');
+}
+

third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_touch-action-auto-css_touch-manual-automation.js

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

third_party/blink/web_tests/external/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('#scrollTarget', 'down').then(function() {
+    return touchScrollInTarget('#scrollTarget', 'right');
+  });
+}

third_party/blink/web_tests/external/wpt_automation/pointerevents/pointerevent_touch-action-pan-x-pan-y_touch-manual-automation.js

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

third_party/blink/web_tests/resources/testdriver-vendor.js

@@ -84,7 +84,6 @@
     for (let i = 0; i < actions.length; i++) {
       var last_x_position = 0;
       var last_y_position = 0;
-      var first_pointer_down = false;
       for (let j = 0; j < actions[i].actions.length; j++) {
         if ('origin' in actions[i].actions[j]) {
           if (actions[i].actions[j].origin == "viewport") {
@@ -127,16 +126,6 @@
           actions[i].actions[j].x = last_x_position;
           actions[i].actions[j].y = last_y_position;
         }
-
-        if ('parameters' in actions[i] && actions[i].parameters.pointerType == "touch") {
-          if (actions[i].actions[j].type == "pointerMove" && !first_pointer_down) {
-            actions[i].actions.splice(j--, 1);
-          } else if (actions[i].actions[j].type == "pointerDown") {
-            first_pointer_down = true;
-          } else if (actions[i].actions[j].type == "pointerUp") {
-            first_pointer_down = false;
-          }
-        }
       }
     }