Modified: branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/over-enter-out-leave.html (245591 => 245592)
--- branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/over-enter-out-leave.html 2019-05-21 19:54:55 UTC (rev 245591)
+++ branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/over-enter-out-leave.html 2019-05-21 19:59:26 UTC (rev 245592)
@@ -23,9 +23,9 @@
{ type: "pointerover", x: 100, y: 100, isPrimary: true },
{ type: "pointerenter", x: 100, y: 100, isPrimary: true },
{ type: "pointerdown", x: 100, y: 100, isPrimary: true },
- { type: "pointerup", x: 100, y: 100, isPrimary: true },
- { type: "pointerout", x: 100, y: 100, isPrimary: true },
- { type: "pointerleave", x: 100, y: 100, isPrimary: true },
+ { type: "pointerup", x: 100, y: 100, isPrimary: false },
+ { type: "pointerout", x: 100, y: 100, isPrimary: false },
+ { type: "pointerleave", x: 100, y: 100, isPrimary: false },
]);
test.done();
});
Modified: branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/pointer-event-order.html (245591 => 245592)
--- branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/pointer-event-order.html 2019-05-21 19:54:55 UTC (rev 245591)
+++ branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/pointer-event-order.html 2019-05-21 19:59:26 UTC (rev 245592)
@@ -20,9 +20,9 @@
{ type: "pointerover", x: 100, y: 100, isPrimary: true },
{ type: "pointerenter", x: 100, y: 100, isPrimary: true },
{ type: "pointerdown", x: 100, y: 100, isPrimary: true },
- { type: "pointerup", x: 100, y: 100, isPrimary: true },
- { type: "pointerout", x: 100, y: 100, isPrimary: true },
- { type: "pointerleave", x: 100, y: 100, isPrimary: true },
+ { type: "pointerup", x: 100, y: 100, isPrimary: false },
+ { type: "pointerout", x: 100, y: 100, isPrimary: false },
+ { type: "pointerleave", x: 100, y: 100, isPrimary: false },
{ type: "click", x: 100, y: 100 },
]);
test.done();
Modified: branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/pointer-events-is-primary.html (245591 => 245592)
--- branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/pointer-events-is-primary.html 2019-05-21 19:54:55 UTC (rev 245591)
+++ branches/safari-608.1.24.20-branch/LayoutTests/pointerevents/ios/pointer-events-is-primary.html 2019-05-21 19:59:26 UTC (rev 245592)
@@ -14,11 +14,10 @@
target_test((target, test) => {
target.style.touchAction = "none";
- const eventTracker = new EventTracker(target, ["pointerover", "pointerenter", "pointerdown", "pointermove", "pointerup", "pointerout", "pointerleave"]);
+ const eventTracker = new EventTracker(target, ["pointerdown", "pointermove"]);
const _one_ = ui.finger();
const two = ui.finger();
- const three = ui.finger();
ui.sequence([
one.begin({ x: 10, y: 10 }),
two.begin({ x: 50, y: 50 }),
@@ -26,45 +25,18 @@
one.move({ x: 30, y: 30 }),
one.end(),
two.move({ x: 50, y: 50 }),
- two.end(),
- three.begin({ x: 10, y: 10 }),
- three.end(),
+ two.end()
]).then(() => {
eventTracker.assertMatchesEvents([
- // Yielded by one.begin({ x: 10, y: 10 }).
- { id: 1, type: "pointerover", x: 10, y: 10, isPrimary: true },
- { id: 1, type: "pointerenter", x: 10, y: 10, isPrimary: true },
{ id: 1, type: "pointerdown", x: 10, y: 10, isPrimary: true },
- // Yielded by two.begin({ x: 50, y: 50 }).
- { id: 2, type: "pointerover", x: 50, y: 50, isPrimary: false },
- { id: 2, type: "pointerenter", x: 50, y: 50, isPrimary: false },
{ id: 2, type: "pointerdown", x: 50, y: 50, isPrimary: false },
- // Yielded by two.move({ x: 70, y: 70 }).
{ id: 2, type: "pointermove", x: 70, y: 70, isPrimary: false },
- // Yielded by one.move({ x: 30, y: 30 }).
{ id: 1, type: "pointermove", x: 30, y: 30, isPrimary: true },
- // Yielded by one.end().
- { id: 1, type: "pointerup", x: 30, y: 30, isPrimary: true },
- { id: 1, type: "pointerout", x: 30, y: 30, isPrimary: true },
- { id: 1, type: "pointerleave", x: 30, y: 30, isPrimary: true },
- // Yielded by two.move({ x: 50, y: 50 }).
- { id: 2, type: "pointermove", x: 50, y: 50, isPrimary: false },
- // Yielded by two.end().
- { id: 2, type: "pointerup", x: 50, y: 50, isPrimary: false },
- { id: 2, type: "pointerout", x: 50, y: 50, isPrimary: false },
- { id: 2, type: "pointerleave", x: 50, y: 50, isPrimary: false },
- // Yielded by three.begin({ x: 10, y: 10 }).
- { id: 3, type: "pointerover", x: 10, y: 10, isPrimary: true },
- { id: 3, type: "pointerenter", x: 10, y: 10, isPrimary: true },
- { id: 3, type: "pointerdown", x: 10, y: 10, isPrimary: true },
- // Yielded by three.end().
- { id: 3, type: "pointerup", x: 10, y: 10, isPrimary: true },
- { id: 3, type: "pointerout", x: 10, y: 10, isPrimary: true },
- { id: 3, type: "pointerleave", x: 10, y: 10, isPrimary: true },
+ { id: 2, type: "pointermove", x: 50, y: 50, isPrimary: true }
]);
test.done();
});
-}, "The first touch of a touch sequence has isPrimary = true.");
+}, "Oldest active touch has isPrimary = true.");
</script>
</body>
