Backed out 2 changesets (bug 1779206) for causing mochitest-plain failures on test_bug968148.html.

Backed out changeset c6b2cd1eef62 (bug 1779206)
Backed out changeset c93e8b401e3c (bug 1779206)

browser/components/resistfingerprinting/test/mochitest/test_pointer_event.html

@@ -86,8 +86,8 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1363508
     ];
 
     synthesizeTouch(target0, 5, 5, { type: "touchstart" });
-    synthesizeTouch(target0, 6, 6, { type: "touchmove" });
-    synthesizeTouch(target0, 6, 6, { type: "touchcancel" });
+    synthesizeTouch(target0, 5, 5, { type: "touchmove" });
+    synthesizeTouch(target0, 5, 5, { type: "touchcancel" });
 
     await Promise.all(eventPromises);
   }

dom/events/test/pointerevents/mochitest.ini

@@ -11,10 +11,6 @@ support-files =
   pointerevent_utils.js
   !/gfx/layers/apz/test/mochitest/apz_test_utils.js
 
-[test_bug968148.html]
-support-files =
-  bug968148_inner.html
-  bug968148_inner2.html
 [test_bug1285128.html]
 [test_bug1293174_implicit_pointer_capture_for_touch_1.html]
 support-files = bug1293174_implicit_pointer_capture_for_touch_1.html

dom/events/test/pointerevents/test_bug1403055.html

@@ -50,7 +50,7 @@ function withoutImplicitlyPointerCaptureForTouch() {
   }, {once : true});
 
   synthesizeTouch(target0, 5, 5, { type: "touchstart" });
-  synthesizeTouch(target0, 6, 6, { type: "touchmove" });
+  synthesizeTouch(target0, 5, 5, { type: "touchmove" });
   synthesizeTouch(target1, 5, 5, { type: "touchmove" });
   synthesizeTouch(target1, 5, 5, { type: "touchcancel" });
   synthesizeMouseAtCenter(done, { type: "mousedown" });

dom/events/test/pointerevents/test_bug1420589_1.html

@@ -85,10 +85,10 @@ function withoutImplicitlyPointerCaptureForTouch() {
                        [left1, left2], [top1, top2], [rx, rx], [ry, ry],
                        [angle, angle], [force, force], modifiers);
   utils.sendTouchEvent('touchmove', [test1PointerId, test2PointerId],
-                       [left1 + 1, left2 + 1], [top1, top2], [rx, rx], [ry, ry],
+                       [left1, left2], [top1, top2], [rx, rx], [ry, ry],
                        [angle, angle], [force, force], modifiers);
   utils.sendTouchEvent('touchend', [test1PointerId, test2PointerId],
-                       [left1 + 1, left2 + 1], [top1, top2], [rx, rx], [ry, ry],
+                       [left1, left2], [top1, top2], [rx, rx], [ry, ry],
                        [angle, angle], [force, force], modifiers);
 }
 

dom/events/test/pointerevents/test_multiple_touches.html

@@ -164,6 +164,8 @@ add_task(async function ShouldNotSendDuplicatedPointerMove() {
     [ // [event target, event type]
       [target0, "pointerdown"],
       [target1, "pointerdown"],
+      // The first pointermove should not be suppressed.
+      [target0, "pointermove"],
       [target1, "pointermove"],
       // Should receive only one pointer event for target 1.
       [target1, "pointermove"],

dom/events/test/pointerevents/test_pointercapture_remove_iframe.html

@@ -67,7 +67,7 @@ add_task(async function test_remove_iframe_after_pointer_capture() {
     waitForEvent(targetInIframe, "pointermove")
   ]);
   synthesizeTouch(targetInIframe, 10, 10, { type: "touchstart", id: 10 }, iframeWin);
-  synthesizeTouch(targetInIframe, 11, 11, { type: "touchmove", id: 10 }, iframeWin);
+  synthesizeTouch(targetInIframe, 10, 10, { type: "touchmove", id: 10 }, iframeWin);
   await promise;
 
   // Intentionally not synthesize touchend event to not trigger implicit releasing

dom/events/test/pointerevents/test_wpt_pointerevent_releasepointercapture_events_to_original_target-manual.html

@@ -27,9 +27,9 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=1000870
         window.addEventListener("message", function(aEvent) {
           if (aEvent.data == "Test Touch") {
             // Synthesize touch events to run this test.
-            sendTouchEvent(int_win, "target0", "touchstart", {offsetX: 10});
-            sendTouchEvent(int_win, "target0", "touchmove", {offsetX: 11});
-            sendTouchEvent(int_win, "target0", "touchend", {offsetX: 11});
+            sendTouchEvent(int_win, "target0", "touchstart");
+            sendTouchEvent(int_win, "target0", "touchmove");
+            sendTouchEvent(int_win, "target0", "touchend");
             window.postMessage("Test Pen", "*");
           } else if (aEvent.data == "Test Pen") {
             // Synthesize pen events to run this test.

layout/base/TouchManager.cpp

@@ -461,7 +461,9 @@ bool TouchManager::ShouldConvertTouchToPointer(const Touch* aTouch,
       return false;
     }
     case eTouchMove: {
-      return !aTouch->Equals(info.mTouch);
+      // Always fire first pointermove event.
+      return info.mTouch->mMessage != eTouchMove ||
+             !aTouch->Equals(info.mTouch);
     }
     default:
       break;

layout/base/tests/bug968148_inner.html

@@ -253,7 +253,7 @@ function runTests() {
 
   // This should send pointer event to test1d1, test2d1.
   utils.sendTouchEvent('touchmove', [test1PointerId, test2PointerId],
-                       [left1d1 + 1, left2d1 + 1], [top1d1 + 1, top2d1 + 1], [rx, rx], [ry, ry],
+                       [left1d1, left2d1], [top1d1, top2d1], [rx, rx], [ry, ry],
                        [angle, angle], [force, force], modifiers);
 
   // This should send pointer event to test1d2, test2d2.

layout/base/tests/bug968148_inner2.html

@@ -252,12 +252,12 @@ function runTests() {
 
   // This should send pointer event to test1d1, test2d1.
   utils.sendTouchEvent('touchmove', [test1PointerId, test2PointerId],
-                       [left1d1 + 1, left2d1 + 1], [top1d1, top2d1], [rx, rx], [ry, ry],
+                       [left1d1, left2d1], [top1d1, top2d1], [rx, rx], [ry, ry],
                        [angle, angle], [force, force], modifiers);
 
   // This should send pointer event to test1d2, test2d2.
   utils.sendTouchEvent('touchmove', [test1PointerId, test2PointerId],
-                       [left1d1 + 1, left2d1 + 1], [top1d1 + 1, top2d1 + 1], [rx, rx], [ry, ry],
+                       [left1d1 + 1, left2d1 + 1], [top1d1, top2d1], [rx, rx], [ry, ry],
                        [angle, angle], [force, force], modifiers);
 
   is(test1d1pointermovecount, 3, "1d1 shouldn't have got pointermove");

layout/base/tests/mochitest.ini

@@ -99,6 +99,10 @@ skip-if =
     toolkit == 'android'  # Bug 1355821
 [test_bug858459.html]
 skip-if = toolkit == 'android' # Bug 1355822
+[test_bug968148.html]
+support-files =
+  bug968148_inner.html
+  bug968148_inner2.html
 [test_bug970964.html]
 support-files =
   bug970964_inner.html