1 files changed, 18 insertions, 10 deletions
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 28ca96ec93..27f52efc71 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
@@ -9,6 +9,7 @@
   <script src="/dom/events/scrolling/scroll_support.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="/web-animations/testcommon.js"></script>
 </head>
 
 <body>
@@ -63,6 +64,8 @@
     </div>
     <script>
       const scroller = document.getElementById("scroller");
+      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) => {
@@ -75,13 +78,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.
@@ -94,13 +97,13 @@
               Math.round(snap_area_2.offsetTop / 2) + 1,
               { origin: scroller }).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.
@@ -121,13 +124,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.
@@ -139,13 +142,13 @@
             scroller.focus();
             window.test_driver.send_keys(scroller, '\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.");
 
       // Touch scroll test: peek at snap_area_2 and then drag back to
@@ -174,10 +177,15 @@
           .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.");
 
+      promise_test(async (t) => {
+        await test_user_scroll_onsnapchanging(t, scroller, scroller,
+                                             snap_area_2);
+      }, "Element.onsnapchanging fires when scrolling a snap container.");
+
     // snapchanging doesn't fire test.
     promise_test(async (t) => {
       test_no_snapchanging(t, scroller, 10);