From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:35:49 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- testing/web-platform/meta/navigation-api/__dir__.ini | 2 ++ .../navigate-event/navigate-history-back-bfcache.html.ini | 7 ++++++- .../activation-after-bfcache-cross-origin.html.ini | 11 ++++++----- .../navigation-activation/activation-after-bfcache.html.ini | 9 ++++++--- 4 files changed, 20 insertions(+), 9 deletions(-) create mode 100644 testing/web-platform/meta/navigation-api/__dir__.ini (limited to 'testing/web-platform/meta/navigation-api') diff --git a/testing/web-platform/meta/navigation-api/__dir__.ini b/testing/web-platform/meta/navigation-api/__dir__.ini new file mode 100644 index 0000000000..1de6f71af9 --- /dev/null +++ b/testing/web-platform/meta/navigation-api/__dir__.ini @@ -0,0 +1,2 @@ +# https://bugzilla.mozilla.org/show_bug.cgi?id=1777171 +implementation-status: backlog \ No newline at end of file diff --git a/testing/web-platform/meta/navigation-api/navigate-event/navigate-history-back-bfcache.html.ini b/testing/web-platform/meta/navigation-api/navigate-event/navigate-history-back-bfcache.html.ini index 5b46d8b60f..b7a915faed 100644 --- a/testing/web-platform/meta/navigation-api/navigate-event/navigate-history-back-bfcache.html.ini +++ b/testing/web-platform/meta/navigation-api/navigate-event/navigate-history-back-bfcache.html.ini @@ -1,3 +1,8 @@ [navigate-history-back-bfcache.html] + expected: + if os == "win": [TIMEOUT, OK] + TIMEOUT [navigate event should fire when traversing to a bfcache hit] - expected: FAIL + expected: + if os == "win": [TIMEOUT, FAIL] + TIMEOUT diff --git a/testing/web-platform/meta/navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html.ini b/testing/web-platform/meta/navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html.ini index fef96123b0..ecb79a624d 100644 --- a/testing/web-platform/meta/navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html.ini +++ b/testing/web-platform/meta/navigation-api/navigation-activation/activation-after-bfcache-cross-origin.html.ini @@ -1,9 +1,10 @@ [activation-after-bfcache-cross-origin.html] expected: - if (os == "win") and not debug and (processor == "x86_64"): [OK, TIMEOUT] - if (os == "win") and not debug and (processor == "x86"): [OK, TIMEOUT] + if os == "win": [TIMEOUT, OK] + if os == "android": OK + TIMEOUT [navigation.activation must be updated when restored from bfcache] expected: - if (os == "win") and not debug and (processor == "x86_64"): [FAIL, TIMEOUT] - if (os == "win") and not debug and (processor == "x86"): [FAIL, TIMEOUT] - FAIL + if os == "win": [TIMEOUT, FAIL] + if os == "android": FAIL + TIMEOUT diff --git a/testing/web-platform/meta/navigation-api/navigation-activation/activation-after-bfcache.html.ini b/testing/web-platform/meta/navigation-api/navigation-activation/activation-after-bfcache.html.ini index 670049b064..bf594507b8 100644 --- a/testing/web-platform/meta/navigation-api/navigation-activation/activation-after-bfcache.html.ini +++ b/testing/web-platform/meta/navigation-api/navigation-activation/activation-after-bfcache.html.ini @@ -1,7 +1,10 @@ [activation-after-bfcache.html] expected: - if (os == "win") and not debug and (processor == "x86_64"): [OK, TIMEOUT] + if os == "win": [TIMEOUT, OK] + if os == "android": OK + TIMEOUT [navigation.activation must be updated when restored from bfcache] expected: - if (os == "win") and not debug and (processor == "x86_64"): [FAIL, TIMEOUT] - FAIL + if os == "win": [TIMEOUT, FAIL] + if os == "android": FAIL + TIMEOUT -- cgit v1.2.3