diff options
Diffstat (limited to 'testing/web-platform/tests/css/css-scroll-snap-2')
13 files changed, 349 insertions, 93 deletions
diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/resources/common.js b/testing/web-platform/tests/css/css-scroll-snap-2/resources/common.js index a3591d48ed..8dce29474d 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/resources/common.js +++ b/testing/web-platform/tests/css/css-scroll-snap-2/resources/common.js @@ -26,13 +26,15 @@ async function snap_test_setup(test, scroller, event_type) { }); } -async function test_snap_event(test, test_data, event_type) { +async function test_snap_event(test, test_data, event_type, + use_onsnap_member = false) { await snap_test_setup(test, test_data.scroller, event_type); let listener = test_data.scroller == document.scrollingElement ? document : test_data.scroller; - const event_promise = waitForSnapEvent(listener, event_type); + const event_promise = waitForSnapEvent(listener, event_type, true, + use_onsnap_member); await test_data.scrolling_function(); let evt = await event_promise; @@ -45,19 +47,36 @@ async function test_snap_event(test, test_data, event_type) { "horizontal scroll offset mismatch."); } -async function test_snapchanged(test, test_data) { - await test_snap_event(test, test_data, "snapchanged"); +async function test_snapchanged(test, test_data, use_onsnap_member = false) { + await test_snap_event(test, test_data, "snapchanged", use_onsnap_member); } -function waitForEventUntil(event_target, event_type, wait_until) { +function waitForEventUntil(event_target, event_type, wait_until, + use_onsnap_member = false) { return new Promise(resolve => { let result = null; const listener = (evt) => { result = evt; }; - event_target.addEventListener(event_type, listener); + if (use_onsnap_member) { + if (event_type === "snapchanging") { + event_target.onsnapchanging = listener; + } else { + event_target.onsnapchanged = listener; + } + } else { + event_target.addEventListener(event_type, listener); + } wait_until.then(() => { - event_target.removeEventListener(event_type, listener); + if (use_onsnap_member) { + if (event_type === "snapchanging") { + event_target.onsnapchanging = null; + } else { + event_target.onsnapchanged = null; + } + } else { + event_target.removeEventListener(event_type, listener); + } resolve(result); }); }); @@ -77,30 +96,19 @@ function waitForEventsUntil(event_target, event_type, wait_until) { }); } -function waitForOnSnapchanging(event_target) { - return new Promise(resolve => { - let result = null; - const listener = (evt) => { - result = evt; - }; - event_target.onsnapchanging = listener; - waitForScrollendEventNoTimeout(event_target).then(() => { - event_target.onsnapchanging = null; - resolve(result); - }); - }); -} - // Proxy a wait for a snap event. We want to avoid having a test // timeout in the event of an expected snap event not firing in a particular // test case as that would cause the entire file to fail. // Snap events should fire before scrollend, so if a scroll should happen, wait // for a scrollend event. Otherwise, just do a rAF-based wait. -function waitForSnapEvent(event_target, event_type, scroll_happens = true) { +function waitForSnapEvent(event_target, event_type, scroll_happens = true, + use_onsnap_member = false) { return scroll_happens ? waitForEventUntil(event_target, event_type, - waitForScrollendEventNoTimeout(event_target)) + waitForScrollendEventNoTimeout(event_target), + use_onsnap_member) : waitForEventUntil(event_target, event_type, - waitForAnimationFrames(2)); + waitForAnimationFrames(2), + use_onsnap_member); } function waitForSnapChangedEvent(event_target, scroll_happens = true) { diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/resources/programmatic-scroll-common.js b/testing/web-platform/tests/css/css-scroll-snap-2/resources/programmatic-scroll-common.js deleted file mode 100644 index 8257b98fe3..0000000000 --- a/testing/web-platform/tests/css/css-scroll-snap-2/resources/programmatic-scroll-common.js +++ /dev/null @@ -1,26 +0,0 @@ -// Helper functions for snapchanged-on-programmatic-* tests. - -// Utility function to test that onsnapchanging is triggered for -// snapchanging-on-programmatic-* tests which set up a similar layout in which -// the |scroller| has 3 snap targets that form a vertical column along -// |scroller|'s middle. onsnapchanging should be triggered by conducting a -// programmatic scroll to the top of snap_target. -async function test_programmatic_scroll_onsnapchanging(test, - scroller, - event_target, - snap_target) { - await snap_test_setup(test, scroller, "snapchanging"); - const expected_snap_targets = { block: snap_target, inline: null }; - - // Scroll and wait for a snapchanging event. - const snapchanging_promise = waitForOnSnapchanging(event_target); - scroller.scrollTo(0, snap_target.offsetTop); - const snapchanging_event = await snapchanging_promise; - - // Assert that snapchanging fired and indicated that snap_target would - // be snapped to. - assertSnapEvent(snapchanging_event, expected_snap_targets); - assert_equals(scroller.scrollLeft, 0, "scrollLeft is zero"); - assert_equals(scroller.scrollTop, snap_target.offsetTop, - "snapped to snap_target"); -} diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/resources/user-scroll-common.js b/testing/web-platform/tests/css/css-scroll-snap-2/resources/user-scroll-common.js index 820f143816..07c1428633 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/resources/user-scroll-common.js +++ b/testing/web-platform/tests/css/css-scroll-snap-2/resources/user-scroll-common.js @@ -69,32 +69,3 @@ async function test_no_snapchanged(t, scroller, delta) { async function test_no_snapchanging(t, scroller, delta) { await test_no_snap_event(t, scroller, delta, "snapchanging"); } - -// Utility function to test that onsnapchanging is triggered for -// snapchanging-on-user-* tests which set up a similar layout in which -// the |scroller| has 3 snap targets that form a vertical column along -// |scroller|'s middle. onsnapchanging should be triggered by touch-dragging -// |scroller|'s content so that |snap_target|'s top aligns to |snap_target|. -async function test_user_scroll_onsnapchanging(test, scroller, event_target, - snap_target) { - await snap_test_setup(test, scroller, "snapchanging"); - - // Compute touch positions to drag the top of snap_target to the top of - // the scroller. - const scroller_middle = Math.round(scroller.clientWidth / 2); - const start_pos = { x: scroller_middle, y: snap_target.offsetTop }; - const end_pos = { x: scroller_middle, y: 0 }; - const expected_snap_targets = { block: snap_target, inline: null }; - - // Scroll and wait for a snapchanging event. - const snapchanging_promise = waitForOnSnapchanging(event_target); - await snap_event_touch_scroll_helper(start_pos, end_pos); - const snapchanging_event = await snapchanging_promise; - - // Assert that snapchanging fired and indicated that snap_target would - // be snapped to. - assertSnapEvent(snapchanging_event, expected_snap_targets); - assert_equals(scroller.scrollLeft, 0, "scrollLeft is zero"); - assert_equals(scroller.scrollTop, snap_target.offsetTop, - "snapped to snap_target"); -} diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snap-events-with-pseudo-target.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snap-events-with-pseudo-target.tentative.html new file mode 100644 index 0000000000..baa3efc7ba --- /dev/null +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snap-events-with-pseudo-target.tentative.html @@ -0,0 +1,86 @@ +<!DOCTYPE html> +<html> + <head> + <meta charset="utf-8"> + <title> CSS Scroll Snap 2 Test: Snap Events with pseudo-element targets.</title> + <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#snap-events"> + <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="/css/css-scroll-snap-2/resources/common.js"></script> + <script src="/css/css-scroll-snap-2/resources/user-scroll-common.js"></script> + <script src="/dom/events/scrolling/scroll_support.js"></script> + </head> + <body> + <style> + .scroller { + overflow: scroll; + width: 200px; + height: 200px; + border: solid 1px black; + scroll-snap-type: y mandatory; + position: absolute; + resize: both; + } + .space { + height: 300vh; + width: 300vw; + position: absolute; + } + .scroller::before, .scroller::after { + scroll-snap-align: start; + height: 50px; + width: 50px; + color: white; + display: block; + } + .scroller::before { + content: "before"; + background-color: blue; + } + .scroller::after { + content: "after"; + background-color: orange; + margin-top: 100px; + } + </style> + <div class="scroller" id="scroller"> + <div class="space"></div> + </div> + + <script> + const start_pos = { + x: scroller.clientWidth / 2, + y: scroller.clientHeight / 2, + }; + const end_pos = { x: scroller.clientWidth / 2, y: 0 }; + // The top of the ::after pseudo element is the sum of the + // ::before pseudo-element's height (50) and the ::after + // pseudo-element's margin-top (100). + const after_pseudo_element_top = 50 + 100; + const test_data = { + scroller: scroller, + scrolling_function: async () => { + await snap_event_touch_scroll_helper(start_pos, end_pos); + }, + expected_snap_targets: { block: scroller, inline: null }, + expected_scroll_offsets: { + x: 0, + y: after_pseudo_element_top, + } + }; + + promise_test(async (t) => { + await test_snapchanged(t, test_data); + }, "snapTarget for snapchanged is the owning element when a snap area " + + "belongs to a pseudo-element"); + + promise_test(async (t) => { + await test_snap_event(t, test_data, "snapchanging"); + }, "snapTarget for snapchanging is the owning element when a snap area " + + "belongs to a pseudo-element"); + </script> + </body> +</html> diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-programmatic-root-scroll.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-programmatic-root-scroll.tentative.html index 98ec2e5d75..8360369422 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-programmatic-root-scroll.tentative.html +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-programmatic-root-scroll.tentative.html @@ -8,6 +8,7 @@ <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> <script src="/css/css-scroll-snap-2/resources/common.js"></script> + <script src="/css/css-scroll-snap-2/resources/programmatic-scroll-common.js"></script> <script src="/dom/events/scrolling/scroll_support.js"></script> <script src="/web-animations/testcommon.js"></script> </head> @@ -61,6 +62,7 @@ <script> let scroller = document.scrollingElement; + let snap_point_2 = document.getElementById("snap_point_2"); promise_test(async (t) => { await waitForCompositorCommit(); @@ -79,6 +81,23 @@ }, "snapchanged event fires after snap target changes via scrollTo"); promise_test(async (t) => { + await waitForCompositorCommit(); + const test_data = { + scroller: scroller, + scrolling_function: () => { + scroller.scrollTo(snap_point_2.offsetLeft, snap_point_2.offsetTop); + }, + expected_snap_targets: { block: snap_point_2, inline: snap_point_2 }, + expected_scroll_offsets: { + x: snap_point_2.offsetLeft, + y: snap_point_2.offsetTop, + } + }; + await test_snapchanged(t, test_data, /*use_onsnap_member*/true); + }, "Document.onsnapchanged event fires after snap target changes via" + + "scrollTo"); + + promise_test(async (t) => { checkSnapEventSupport("snapchanged"); await waitForScrollReset(t, scroller); await waitForCompositorCommit(); diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-programmatic-scroll.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-programmatic-scroll.tentative.html index 9dff856f34..2b2e6a77c5 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-programmatic-scroll.tentative.html +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-programmatic-scroll.tentative.html @@ -8,6 +8,7 @@ <script src="/resources/testharness.js"></script> <script src="/resources/testharnessreport.js"></script> <script src="/css/css-scroll-snap-2/resources/common.js"></script> + <script src="/css/css-scroll-snap-2/resources/programmatic-scroll-common.js"></script> <script src="/dom/events/scrolling/scroll_support.js"></script> <script src="/web-animations/testcommon.js"></script> </head> @@ -68,6 +69,7 @@ <script> function runTests () { let scroller = document.getElementById("scroller"); + let snap_point_2 = document.getElementById("snap_point_2"); promise_test(async (t) => { await waitForCompositorCommit(); @@ -86,6 +88,23 @@ }, "snapchanged event fires after snap target changes via scrollTo"); promise_test(async (t) => { + await waitForCompositorCommit(); + const test_data = { + scroller: scroller, + scrolling_function: () => { + scroller.scrollTo(snap_point_2.offsetLeft, snap_point_2.offsetTop); + }, + expected_snap_targets: { block: snap_point_2, inline: snap_point_2 }, + expected_scroll_offsets: { + x: snap_point_2.offsetLeft, + y: snap_point_2.offsetTop, + } + }; + await test_snapchanged(t, test_data, /*use_onsnap_member*/true); + }, "Element.onsnapchanged event fires after snap target changes via" + + "scrollTo"); + + promise_test(async (t) => { checkSnapEventSupport("snapchanged"); await waitForScrollReset(t, scroller); await waitForCompositorCommit(); diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-user-root-scroll.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-user-root-scroll.tentative.html index 127376caa2..a59d9c5859 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-user-root-scroll.tentative.html +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-user-root-scroll.tentative.html @@ -161,6 +161,29 @@ await test_snapchanged(t, test_data); }, "snapchanged event fires after snap target changes on keydown press"); + // Touch scroll test (onsnapchanged variant). + promise_test(async (t) => { + await waitForCompositorCommit(); + const start_pos = { + x: scroller.clientWidth / 2, + y: scroller.clientHeight / 2, + }; + const end_pos = { x: 0, y: 0 }; + const test_data = { + scroller: scroller, + scrolling_function: async () => { + await snap_event_touch_scroll_helper(start_pos, end_pos); + }, + expected_snap_targets: { block: snap_point_2, inline: snap_point_2 }, + expected_scroll_offsets: { + x: offset_to_snap_point_2.x, + y: offset_to_snap_point_2.y, + } + }; + await test_snapchanged(t, test_data, /*use_onsnap_memeber*/true); + }, "Document.snapchanged event fires after snap target changes on touch " + + "scroll"); + promise_test(async (t) => { await test_no_snapchanged(t, scroller, /*delta*/10); }, "snapchanged is not fired if snap target doesn't change on user scroll"); diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-user-scroll.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-user-scroll.tentative.html index 91194642b5..d2c2789c88 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-user-scroll.tentative.html +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-on-user-scroll.tentative.html @@ -165,6 +165,29 @@ await test_snapchanged(t, test_data); }, "snapchanged event fires after snap target changes on keydown press"); + // Touch scroll test (onsnapchanged variant). + promise_test(async (t) => { + await waitForCompositorCommit(); + const start_pos = { + x: scroller.clientWidth / 2, + y: scroller.clientHeight / 2, + }; + const end_pos = { x: 0, y: 0 }; + const test_data = { + scroller: scroller, + scrolling_function: async () => { + await snap_event_touch_scroll_helper(start_pos, end_pos); + }, + expected_snap_targets: { block: snap_point_2, inline: snap_point_2 }, + expected_scroll_offsets: { + x: offset_to_snap_point_2.x, + y: offset_to_snap_point_2.y, + } + }; + await test_snapchanged(t, test_data, /*use_onsnap_memeber*/true); + }, "Element.onsnapchanged event fires after snap target changes on touch " + + "scroll"); + promise_test(async (t) => { await test_no_snapchanged(t, scroller, /*delta*/10); }, "snapchanged is not fired if snap target doesn't change on user scroll"); diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-scrolling-non-snapping-axis.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-scrolling-non-snapping-axis.tentative.html new file mode 100644 index 0000000000..e39fc0c44e --- /dev/null +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanged/snapchanged-scrolling-non-snapping-axis.tentative.html @@ -0,0 +1,77 @@ +<!DOCTYPE html> +<html> + <head> + <title> CSS Scroll Snap 2 Test: snapchanged events</title> + <link rel="help" href="https://drafts.csswg.org/css-scroll-snap-2/#snap-events"> + <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="/css/css-scroll-snap-2/resources/common.js"></script> + <script src="/dom/events/scrolling/scroll_support.js"></script> + <script src="/css/css-scroll-snap/support/common.js"></script> + </head> + <body> + <style> + .scroller { + overflow: scroll; + width: 200px; + height: 200px; + border: solid 1px black; + scroll-snap-type: y mandatory; + position: absolute; + resize: both; + } + .snaparea { + scroll-snap-align: start; + height: 50px; + width: 50px; + color: white; + margin-top: 100px; + background-color: purple; + } + .space { + height: 300vh; + width: 300vw; + position: absolute; + } + </style> + <div class="scroller" id="scroller"> + <div class="space"></div> + <div class="snaparea"> Area2</div> + <div class="snaparea"> Area1</div> + </div> + + <script> + promise_test(async (t) => { + await waitForCompositorCommit(); + + scroller.focus(); + + const snapchanged_promise = waitForSnapEvent(scroller, "snapchanged"); + await test_driver.send_keys(scroller, KEY_CODE_MAP["ArrowRight"]); + const snap_event = await snapchanged_promise; + + assert_equals(snap_event, null, "no snapchanged event fired as " + + "scroller doesn't snap in the x axis"); + }, "keyboard scroll on non-snapping axis doesn't trigger snapchanged"); + + promise_test(async (t) => { + await waitForScrollReset(t, scroller); + await waitForCompositorCommit(); + scroller.focus(); + + const snapchanged_promise = waitForSnapEvent(scroller, "snapchanged"); + const wheel_scroll_amount = 25; + new test_driver.Actions().scroll(0, 0, + wheel_scroll_amount, + 0, + { origin: scroller }).send(); + const snap_event = await snapchanged_promise; + assert_equals(snap_event, null, "no snapchanged event fired as " + + "scroller doesn't snap in the x axis"); + }, "wheel scroll on non-snapping axis doesn't trigger snapchanged"); + </script> + </body> +</html> diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-programmatic-root-scroll.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-programmatic-root-scroll.tentative.html index b714a6cfb5..54c2c95c50 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-programmatic-root-scroll.tentative.html +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-programmatic-root-scroll.tentative.html @@ -87,10 +87,22 @@ " snap targets."); promise_test(async (t) => { - await test_programmatic_scroll_onsnapchanging(t, scroller, document, - snap_area_2); - }, "programmatic scroll triggers Document.snapchanging when scrolling a " + - "snap container"); + await waitForCompositorCommit(); + const test_data = { + scroller: scroller, + scrolling_function: async () => { + scroller.scrollTo(0, snap_area_2.offsetTop); + }, + expected_snap_targets: { block: snap_area_2, inline: null }, + expected_scroll_offsets: { + x: 0, + y: snap_area_2.offsetTop + } + }; + await test_snap_event(t, test_data, "snapchanging", + /*use_onsnap_member*/true); + }, "Document.snapchanging fires on programmatic scrolls that changes a" + + "scroller's snap targets."); promise_test(async (t) => { checkSnapEventSupport("snapchanging"); diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-programmatic-scroll.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-programmatic-scroll.tentative.html index 6e7b0126f7..0bd65f8e42 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-programmatic-scroll.tentative.html +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-programmatic-scroll.tentative.html @@ -94,10 +94,22 @@ " snap targets."); promise_test(async (t) => { - await test_programmatic_scroll_onsnapchanging(t, scroller, scroller, - snap_area_2); - }, "programmatic scroll triggers Element.onsnapchanging when scrolling a " + - "snap container"); + await waitForCompositorCommit(); + const test_data = { + scroller: scroller, + scrolling_function: async () => { + scroller.scrollTo(0, snap_area_2.offsetTop); + }, + expected_snap_targets: { block: snap_area_2, inline: null }, + expected_scroll_offsets: { + x: 0, + y: snap_area_2.offsetTop + } + }; + await test_snap_event(t, test_data, "snapchanging", + /*use_onsnap_member*/true); + }, "Element.onsnapchanging fires on programmatic scrolls that changes a " + + "scroller's snap targets."); promise_test(async (t) => { checkSnapEventSupport("snapchanging"); diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-user-root-scroll.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-user-root-scroll.tentative.html index 815c3c0922..8054db548d 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-user-root-scroll.tentative.html +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-user-root-scroll.tentative.html @@ -159,10 +159,26 @@ await test_snap_event(t, test_data, "snapchanging"); }, "keyboard scroll triggers snapchanging."); + // Touch scroll test (onsnapchanging variant). promise_test(async (t) => { - await test_user_scroll_onsnapchanging(t, scroller, document, - snap_area_2); - }, "Document.onsnapchanging fires when scrolling a snap container."); + await waitForCompositorCommit(); + const scroller_middle = Math.round(scroller.clientWidth / 2); + const test_data = { + scroller: scroller, + scrolling_function: async () => { + const start_pos = { x: scroller_middle, y: snap_area_2.offsetTop }; + const end_pos = { x: scroller_middle, y: 0 }; + await snap_event_touch_scroll_helper(start_pos, end_pos); + }, + expected_snap_targets: { block: snap_area_2, inline: null }, + expected_scroll_offsets: { + x: 0, + y: snap_area_2.offsetTop + } + }; + await test_snap_event(t, test_data, "snapchanging", + /*use_onsnap_memeber*/true); + }, "touch scrolling fires Document.onsnapchanging."); // Touch scroll test: peek at snap_area_2 and then drag back to // snap_area_1. diff --git a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-user-scroll.tentative.html b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-user-scroll.tentative.html index 27f52efc71..3755369a2f 100644 --- a/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-user-scroll.tentative.html +++ b/testing/web-platform/tests/css/css-scroll-snap-2/snapchanging/snapchanging-on-user-scroll.tentative.html @@ -181,10 +181,26 @@ assertSnapEvent(evts[1], { block: snap_area_1, inline: null }); }, "snapchanging fires as scroll moves through different snap targets."); + // Touch scroll test. promise_test(async (t) => { - await test_user_scroll_onsnapchanging(t, scroller, scroller, - snap_area_2); - }, "Element.onsnapchanging fires when scrolling a snap container."); + await waitForCompositorCommit(); + const scroller_middle = Math.round(scroller.clientWidth / 2); + const test_data = { + scroller: scroller, + scrolling_function: async () => { + const start_pos = { x: scroller_middle, y: snap_area_2.offsetTop }; + const end_pos = { x: scroller_middle, y: 0 }; + await snap_event_touch_scroll_helper(start_pos, end_pos); + }, + expected_snap_targets: { block: snap_area_2, inline: null }, + expected_scroll_offsets: { + x: 0, + y: snap_area_2.offsetTop + } + }; + await test_snap_event(t, test_data, "snapchanging", + /*use_onsnap_member*/true); + }, "touch scrolling fires Element.onsnapchanging."); // snapchanging doesn't fire test. promise_test(async (t) => { |