From fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 19 Apr 2024 03:14:29 +0200
Subject: Merging upstream version 125.0.1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 layout/reftests/bugs/1553571-2.html | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'layout/reftests/bugs/1553571-2.html')
diff --git a/layout/reftests/bugs/1553571-2.html b/layout/reftests/bugs/1553571-2.html
index 0b844745c0..ab064ca391 100644
--- a/layout/reftests/bugs/1553571-2.html
+++ b/layout/reftests/bugs/1553571-2.html
@@ -2,6 +2,8 @@
 <html class='reftest-wait'>
 <head>
 <script>
+let num = 0;
+let numMs = 50;
 var changesLeft = 10;
 function go() {
 	window.setTimeout(changeit, 0);
@@ -11,16 +13,26 @@ function changeit() {
 	var a = document.getElementById("a");
 	a.style.transform = 'scale(' + (256.1 + Math.random()*0.01) + ') rotate(1deg)';
 
+	num++;
+
 	if (changesLeft > 0) {
 		--changesLeft;
-		window.setTimeout(changeit, 50);
+		window.setTimeout(changeit, numMs);
 	}
 	if (changesLeft == 0) {
 		// 75-100ms is the timeout for expirty from the active layer tracker.
 		// Increase the time between transform tweaks to 74ms to give the reftest the best
 		// chance of running the mozafterpaint handler and checking that there are no more
 		// paints pending so it can finish.
-		window.setTimeout(changeit, 74);
+		numMs = 74;
+		if (num >= 100 && navigator.appVersion.includes("Android")) {
+			// That's not enough time on Android, so give it a bit more time. This still
+			// reproduces the original bug with the original patch backed out, even though
+			// one would think anything over 100ms would not reproduce, I'm not sure why.
+			// It's better to run the this with this timeout then have the test disabled.
+			numMs = 200;
+		}
+		window.setTimeout(changeit, numMs);
 		document.documentElement.classList.remove("reftest-wait");
 	}
 }
-- 
cgit v1.2.3

