diff options
Diffstat (limited to 'testing/web-platform/tests/css/css-scroll-snap-2/snapchanging')
4 files changed, 70 insertions, 14 deletions
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) => { |