commit 8b474126dbf09c090f9dbd2141a2501a2f04f383 parent 18713a402b5af3881044b0a0b1b395b79c110f84 Author: Andreas Farre <farre@mozilla.com> Date: Wed, 12 Nov 2025 08:43:53 +0000 Bug 1996784 - Navigation API: Revert part 9 of Bug 1970123. r=jjaschke Tests have been changed upstream, so make this change in preparation of syncing wpt. Differential Revision: https://phabricator.services.mozilla.com/D271930 Diffstat:
4 files changed, 6 insertions(+), 32 deletions(-)
diff --git a/dom/navigation/Navigation.cpp b/dom/navigation/Navigation.cpp @@ -1241,9 +1241,7 @@ struct NavigationWaitForAllScope final : public nsISupports, // 5. Abort event given reason. if (AutoJSAPI jsapi; !NS_WARN_IF(!jsapi.Init(mEvent->GetParentObject()))) { RefPtr navigation = mNavigation; - navigation->AbortNavigateEvent( - jsapi.cx(), event, aRejectionReason, - /*aIsCalledFromNavigateFiringFailureSteps=*/true); + navigation->AbortNavigateEvent(jsapi.cx(), event, aRejectionReason); } } // https://html.spec.whatwg.org/#commit-a-navigate-event @@ -1825,24 +1823,17 @@ void Navigation::AbortOngoingNavigation(JSContext* aCx, } // Step 7 - AbortNavigateEvent(aCx, event, error, - /*aIsCalledFromNavigateFiringFailureSteps=*/false); + AbortNavigateEvent(aCx, event, error); } // https://html.spec.whatwg.org/#abort-a-navigateevent -void Navigation::AbortNavigateEvent( - JSContext* aCx, NavigateEvent* aEvent, JS::Handle<JS::Value> aReason, - bool aIsCalledFromNavigateFiringFailureSteps) { +void Navigation::AbortNavigateEvent(JSContext* aCx, NavigateEvent* aEvent, + JS::Handle<JS::Value> aReason) { // 1. Let navigation be event's relevant global object's navigation API. // Omitted since this is called from a Navigation object. // 2. Signal abort on event's abort controller given reason. - if (!aIsCalledFromNavigateFiringFailureSteps || - aEvent->InterceptionState() == - NavigateEvent::InterceptionState::Intercepted) { - // https://github.com/whatwg/html/issues/11831 - aEvent->AbortController()->Abort(aCx, aReason); - } + aEvent->AbortController()->Abort(aCx, aReason); // 3. Let errorInfo be the result of extracting error information from reason. RootedDictionary<ErrorEventInit> init(aCx); diff --git a/dom/navigation/Navigation.h b/dom/navigation/Navigation.h @@ -186,8 +186,7 @@ class Navigation final : public DOMEventTargetHelper { MOZ_CAN_RUN_SCRIPT void AbortNavigateEvent(JSContext* aCx, NavigateEvent* aEvent, - JS::Handle<JS::Value> aReason, - bool aIsCalledFromNavigateFiringFailureSteps); + JS::Handle<JS::Value> aReason); MOZ_CAN_RUN_SCRIPT void InformAboutChildNavigableDestruction(JSContext* aCx); diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/navigate-same-document-intercept-reject.html.ini @@ -1,8 +0,0 @@ -[navigate-same-document-intercept-reject.html?no-currententrychange] - [event and promise ordering for same-document navigation.navigate() intercepted by passing a rejected promise to intercept()] - expected: FAIL - - -[navigate-same-document-intercept-reject.html?currententrychange] - [event and promise ordering for same-document navigation.navigate() intercepted by passing a rejected promise to intercept()] - expected: FAIL diff --git a/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-intercept-reject.html.ini b/testing/web-platform/meta/navigation-api/ordering-and-transition/reload-intercept-reject.html.ini @@ -1,8 +0,0 @@ -[reload-intercept-reject.html?currententrychange] - [event and promise ordering for navigation.reload() intercepted by intercept()] - expected: FAIL - - -[reload-intercept-reject.html?no-currententrychange] - [event and promise ordering for navigation.reload() intercepted by intercept()] - expected: FAIL