From 086c044dc34dfc0f74fbe41f4ecb402b2cd34884 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 19 Apr 2024 03:13:33 +0200 Subject: Merging upstream version 125.0.1. Signed-off-by: Daniel Baumann --- .../meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini | 4 ---- .../meta/css/cssom-view/scroll-behavior-subframe-window.html.ini | 6 +++++- .../web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini | 6 ------ 3 files changed, 5 insertions(+), 11 deletions(-) delete mode 100644 testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini (limited to 'testing/web-platform/meta/css/cssom-view') diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini deleted file mode 100644 index 3a4ffebfcf..0000000000 --- a/testing/web-platform/meta/css/cssom-view/scroll-behavior-main-frame-root.html.ini +++ /dev/null @@ -1,4 +0,0 @@ -[scroll-behavior-main-frame-root.html] - [Main frame with smooth scroll-behavior ; scroll() with auto behavior] - expected: - if not fission and (os == "linux") and debug and not swgl: [PASS, FAIL] diff --git a/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini b/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini index e14518702c..f80bab1793 100644 --- a/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini +++ b/testing/web-platform/meta/css/cssom-view/scroll-behavior-subframe-window.html.ini @@ -1,7 +1,7 @@ [scroll-behavior-subframe-window.html] [Main frame with smooth scroll-behavior ; scroll() with default behavior] expected: - if (os == "linux") and debug and not fission: [PASS, FAIL] + if not fission and (os == "linux") and debug: [PASS, FAIL] [Main frame with smooth scroll-behavior ; scroll() with auto behavior] expected: @@ -20,3 +20,7 @@ [Main frame with auto scroll-behavior ; scrollBy() with default behavior] expected: if (os == "win") and debug: [PASS, FAIL] + + [Main frame with auto scroll-behavior ; scrollBy() with smooth behavior] + expected: + if (processor == "x86") and debug: [PASS, FAIL] diff --git a/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini b/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini index b000fb8847..ae9764e572 100644 --- a/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini +++ b/testing/web-platform/meta/css/cssom-view/scrollIntoView-smooth.html.ini @@ -3,22 +3,16 @@ disabled: if debug and (os == "linux") and (processor == "x86"): wpt-sync Bug 1461151 expected: - if (os == "win") and debug and not swgl: [PASS, FAIL] - if (os == "linux") and swgl: [PASS, FAIL] if os == "android": FAIL [Smooth scrollIntoView should scroll the element to the 'center' position] expected: - if (os == "win") and debug and not swgl: [PASS, FAIL] if os == "android": FAIL [Smooth scrollIntoView should scroll the element to the 'nearest' position] expected: - if (os == "linux") and not fission and debug and swgl: [PASS, FAIL] - if (os == "linux") and not fission and not debug: [PASS, FAIL] if os == "android": FAIL [Smooth scrollIntoView should scroll the element to the 'start' position] expected: - if (os == "linux") and debug and not fission: [PASS, FAIL] if os == "android": FAIL -- cgit v1.2.3