Bug 1990305 [wpt PR 55017] - Make scroll-timelines/setting-* tests pass for run-snapshot-post-layout, a=testonly

Automatic update from web-platform-tests
Make scroll-timelines/setting-* tests pass for run-snapshot-post-layout

Preparing for proposed change:

whatwg/html#11613

Bug: 384523570

Change-Id: Ic4ba0c31dcf0a1783dd2710462a5061ff8586c52
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6976604
Commit-Queue: Rune Lillesveen <[email protected]>
Reviewed-by: Kevin Ellis <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1519481}

--

wpt-commits: 538a74ceed6fb26498dccfb6a3ec3aa8baec363a
wpt-pr: 55017

Author: lilles

testing/web-platform/tests/scroll-animations/scroll-timelines/setting-current-time.html

@@ -228,9 +228,9 @@
   await animation.ready;
 
   // Make the timeline inactive.
-  scroller.style.overflow = 'visible';
-  scroller.scrollTop;
-  await waitForNextFrame();
+  await runAndWaitForFrameUpdate(() => {
+    scroller.style.overflow = 'visible';
+  });
 
   assert_equals(animation.currentTime, null,
     'Current time is unresolved when the timeline is inactive.');
@@ -255,9 +255,9 @@
     await animation.ready;
 
     // Make the timeline inactive.
-    scroller.style.overflow = 'visible';
-    scroller.scrollTop;
-    await waitForNextFrame();
+    await runAndWaitForFrameUpdate(() => {
+      scroller.style.overflow = 'visible';
+    });
 
     assert_equals(animation.timeline.currentTime, null,
       'Current time is unresolved when the timeline is inactive.');
@@ -270,9 +270,9 @@
       'timeline is inactive.');
 
     // Make the timeline active.
-    scroller.style.overflow = 'auto';
-    scroller.scrollTop;
-    await waitForNextFrame();
+    await runAndWaitForFrameUpdate(() => {
+      scroller.style.overflow = 'auto';
+    });
 
     assert_percents_equal(animation.timeline.currentTime, 0,
       'Current time is resolved when the timeline is active.');

testing/web-platform/tests/scroll-animations/scroll-timelines/setting-playback-rate.html

@@ -104,10 +104,12 @@
     animation.playbackRate = 2;
     animation.play();
     await animation.ready;
-    scroller.scrollTop = 0.2 * maxScroll;
+
     // Wait for new animation frame  which allows the timeline to compute new
     // current time.
-    await waitForNextFrame();
+    await runAndWaitForFrameUpdate(() => {
+      scroller.scrollTop = 0.2 * maxScroll;
+    });
 
     assert_percents_equal(animation.currentTime, 40,
                           'The current time should increase two times faster ' +
@@ -208,8 +210,9 @@
 
     animation.playbackRate = -1;
 
-    scroller.scrollTop = 0.8 * maxScroll;
-    await waitForNextFrame();
+    await runAndWaitForFrameUpdate(() => {
+      scroller.scrollTop = 0.8 * maxScroll;
+    });
     // -300 = 500 - 800
 
     // let timelineDiff =
@@ -219,8 +222,9 @@
     assert_percents_equal(animation.timeline.currentTime, 80);
     assert_percents_equal(animation.currentTime, 20);
 
-    scroller.scrollTop = 0.2 * maxScroll;
-    await waitForNextFrame();
+    await runAndWaitForFrameUpdate(() => {
+      scroller.scrollTop = 0.2 * maxScroll;
+    });
     // // 300 = 500 - 200
     // timelineDiff =
     //     startingTimelineTime.value - animation.timeline.currentTime.value;
@@ -259,9 +263,10 @@
 
     await animation.ready;
     assert_percents_equal(animation.currentTime, 20);
-    animation.playbackRate = 0;
-    scroller.scrollTop = 0.5 * maxScroll;
-    await waitForNextFrame();
+    await runAndWaitForFrameUpdate(() => {
+      animation.playbackRate = 0;
+      scroller.scrollTop = 0.5 * maxScroll;
+    });
 
     // Ensure that current time does not change.
     assert_percents_equal(animation.timeline.currentTime, 50);

testing/web-platform/tests/scroll-animations/scroll-timelines/setting-start-time.html

@@ -41,10 +41,12 @@
   const animation = createScrollLinkedAnimation(t);
   const scroller = animation.timeline.source;
   const maxScroll = scroller.scrollHeight - scroller.clientHeight;
-  scroller.scrollTop = 0.2 * maxScroll;
+
   // Wait for new animation frame which allows the timeline to compute new
   // current time.
-  await waitForNextFrame();
+  await runAndWaitForFrameUpdate(() => {
+    scroller.scrollTop = 0.2 * maxScroll;
+  });
 
   // So long as a hold time is set, querying the current time will return
   // the hold time.

testing/web-platform/tests/scroll-animations/scroll-timelines/setting-timeline.tentative.html

@@ -53,10 +53,12 @@
 function updateScrollPosition(timeline, offset) {
   const scroller = timeline.source;
   assert_true(!!scroller, 'source is resolved');
-  scroller.scrollTop = offset;
+
   // Wait for new animation frame which allows the timeline to compute new
   // current time.
-  return waitForNextFrame();
+  return runAndWaitForFrameUpdate(() => {
+    scroller.scrollTop = offset;
+  });
 }
 
 function assert_timeline_current_time(animation, timeline_current_time) {