Adding upstream version 125.0.1.upstream/125.0.1

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 12 insertions, 11 deletions

diff --git a/testing/web-platform/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html b/testing/web-platform/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html
index cfc782a809..be4176df59 100644
--- a/testing/web-platform/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html
+++ b/testing/web-platform/tests/dom/events/scrolling/overscroll-event-fired-to-scrolled-element.html
@@ -10,11 +10,14 @@
   width: 200px;
   height: 200px;
   overflow: scroll;
+  position: absolute;
+  left: 150px;
+  top: 150px;
 }
 
 #innerDiv {
-  width: 400px;
-  height: 400px;
+  width: 250px;
+  height: 250px;
 }
 </style>
 
@@ -45,7 +48,7 @@ function runTest() {
     await waitForCompositorCommit();
 
     // Do a horizontal scroll and wait for overscroll event.
-    await touchScrollInTarget(300, scrolling_div , 'right');
+    await touchScrollInTarget(100, scrolling_div , 'right');
     await waitFor(() => { return overscrolled_x_delta > 0; },
         'Scroller did not receive overscroll event after horizontal scroll.');
     assert_equals(scrolling_div.scrollWidth - scrolling_div.scrollLeft,
@@ -55,7 +58,7 @@ function runTest() {
     overscrolled_y_delta = 0;
 
     // Do a vertical scroll and wait for overscroll event.
-    await touchScrollInTarget(300, scrolling_div, 'down');
+    await touchScrollInTarget(100, scrolling_div, 'down');
     await waitFor(() => { return overscrolled_y_delta > 0; },
         'Scroller did not receive overscroll event after vertical scroll.');
     assert_equals(scrolling_div.scrollHeight - scrolling_div.scrollTop,
diff --git a/testing/web-platform/tests/dom/events/scrolling/scroll_support.js b/testing/web-platform/tests/dom/events/scrolling/scroll_support.js
index e86ead5456..e536b7d748 100644
--- a/testing/web-platform/tests/dom/events/scrolling/scroll_support.js
+++ b/testing/web-platform/tests/dom/events/scrolling/scroll_support.js
@@ -26,17 +26,15 @@ async function waitForPointercancelEvent(test, target, timeoutMs = 500) {
 
 // Resets the scroll position to (0,0).  If a scroll is required, then the
 // promise is not resolved until the scrollend event is received.
-async function waitForScrollReset(test, scroller, timeoutMs = 500) {
+async function waitForScrollReset(test, scroller, x = 0, y = 0) {
   return new Promise(resolve => {
-    if (scroller.scrollTop == 0 &&
-        scroller.scrollLeft == 0) {
+    if (scroller.scrollTop == x && scroller.scrollLeft == y) {
       resolve();
     } else {
       const eventTarget =
         scroller == document.scrollingElement ? document : scroller;
-      scroller.scrollTop = 0;
-      scroller.scrollLeft = 0;
-      waitForScrollendEvent(test, eventTarget, timeoutMs).then(resolve);
+      scroller.scrollTo(x, y);
+      waitForScrollendEventNoTimeout(eventTarget).then(resolve);
     }
   });
 }
@@ -121,7 +119,7 @@ function waitForCompositorCommit() {
 // deferred running the tests until after paint holding.
 async function waitForCompositorReady() {
   const animation =
-      document.body.animate({ opacity: [ 1, 1 ] }, {duration: 1 });
+      document.body.animate({ opacity: [ 0, 1 ] }, {duration: 1 });
   return animation.finished;
 }