1 files changed, 17 insertions, 10 deletions

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 a9b003e6c5..815c3c0922 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
@@ -74,6 +74,8 @@
   <div id="snap_area_3" class="yellow snap box"></div>
   <script>
     const scroller = document.scrollingElement;
+    const snap_area_2 = document.getElementById("snap_area_2");
+    const snap_area_1 = document.getElementById("snap_area_1");
 
     // Touch scroll test.
     promise_test(async (t) => {
@@ -86,13 +88,13 @@
           const end_pos = { x: scroller_middle, y: 0 };
           await snap_event_touch_scroll_helper(start_pos, end_pos);
         },
-        expected_snap_targets: [snap_area_2.id],
+        expected_snap_targets: { block: snap_area_2, inline: null },
         expected_scroll_offsets: {
           x: 0,
           y: snap_area_2.offsetTop
         }
       };
-      await test_snap_event_deprecated(t, test_data, "snapchanging");
+      await test_snap_event(t, test_data, "snapchanging");
     }, "touch scrolling fires snapchanging.");
 
     // Wheel scroll test.
@@ -104,13 +106,13 @@
           await new test_driver.Actions().scroll(0, 0, 0,
             Math.round(snap_area_2.offsetTop / 2) + 1).send();
         },
-        expected_snap_targets: [snap_area_2.id],
+        expected_snap_targets: { block: snap_area_2, inline: null },
         expected_scroll_offsets: {
           x: 0,
           y: snap_area_2.offsetTop
         }
       };
-      await test_snap_event_deprecated(t, test_data, "snapchanging");
+      await test_snap_event(t, test_data, "snapchanging");
     }, "mouse wheel scroll triggers snapchanging.");
 
     // Scrollbar drag test.
@@ -130,13 +132,13 @@
             scrollbar_to_scroller_ratio;
           await snap_event_scrollbar_drag_helper(scroller, scrollbar_width, drag_amt);
         },
-        expected_snap_targets: [snap_area_2.id],
+        expected_snap_targets: { block: snap_area_2, inline: null },
         expected_scroll_offsets: {
           x: 0,
           y: snap_area_2.offsetTop
         }
       };
-      await test_snap_event_deprecated(t, test_data, "snapchanging");
+      await test_snap_event(t, test_data, "snapchanging");
     }, "scrollbar dragging fires snapchanging.");
 
     // Keyboard test.
@@ -148,15 +150,20 @@
           scroller.focus();
           window.test_driver.send_keys(document.documentElement, '\ue015'/*ArrowDown*/);
         },
-        expected_snap_targets: [snap_area_2.id],
+        expected_snap_targets: { block: snap_area_2, inline: null },
         expected_scroll_offsets: {
            x: 0,
            y: snap_area_2.offsetTop
         }
        };
-      await test_snap_event_deprecated(t, test_data, "snapchanging");
+      await test_snap_event(t, test_data, "snapchanging");
     }, "keyboard scroll triggers snapchanging.");
 
+    promise_test(async (t) => {
+      await test_user_scroll_onsnapchanging(t, scroller, document,
+                                             snap_area_2);
+    }, "Document.onsnapchanging fires when scrolling a snap container.");
+
     // Touch scroll test: peek at snap_area_2 and then drag back to
     // snap_area_1.
     promise_test(async (t) => {
@@ -183,8 +190,8 @@
         .send();
       let evts = await evts_promise;
       assert_equals(evts.length, 2, "2 snapchanging events are seens");
-      assertSnapEventDeprecated(evts[0], [snap_area_2.id]);
-      assertSnapEventDeprecated(evts[1], [snap_area_1.id]);
+      assertSnapEvent(evts[0], { block: snap_area_2, inline: null });
+      assertSnapEvent(evts[1], { block: snap_area_1, inline: null });
     }, "snapchanging fires as scroll moves through different snap targets.");
 
     // snapchanging doesn't fire test.