Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-09-30 08:39:16 +01:00
Code Issues Projects Releases Packages Wiki Activity

script: abort planned form navigations (#38676)

Browse source 
Servo shows a behavior unlike FF and Safari(I don't have Chrome), where
stopping a window does not cancel planned form navigation, resulting in
an infinite navigation loop. The current behavior of Servo does seem to
follow the wording of the spec, so I will open a [companion issue at the
spec](https://github.com/whatwg/html/issues/11562), and I have also
written a WPT tests for the non-standard but widely followed behavior.
This PR also adds a beginning of an implementation of the "ongoing
navigation" concept, which is used by the spec to cancel navigations,
and which is used in this PR only to cancel planned form navigations.
The generation id concept, which corresponds to the planned navigation
concept in the spec, is turned into a simple struct private cell, and is
documented per the spec.

Testing: A new WPT test is added
Fixes: Only one part of https://github.com/servo/servo/issues/36747

---------

Signed-off-by: gterzian <2792687+gterzian@users.noreply.github.com>
Signed-off-by: Gregory Terzian <2792687+gterzian@users.noreply.github.com>
Co-authored-by: Martin Robinson <mrobinson@igalia.com>
This commit is contained in:
Gregory Terzian 2025-08-22 13:02:53 +08:00 • committed by GitHub
parent 0026213799
commit ede9db2e18
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 144 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

61
components/script/dom/window.rs
View file

@ -227,6 +227,11 @@ impl LayoutBlocker {
}
}
/// An id used to cancel navigations; for now only used for planned form navigations.
/// Loosely based on <https://html.spec.whatwg.org/multipage/#ongoing-navigation>.
#[derive(Clone, Copy, Debug, Default, JSTraceable, MallocSizeOf, PartialEq)]
pub(crate) struct OngoingNavigation(u32);
type PendingImageRasterizationKey = (PendingImageId, DeviceIntSize);
#[dom_struct]
@ -267,6 +272,10 @@ pub(crate) struct Window {
status: DomRefCell<DOMString>,
trusted_types: MutNullableDom<TrustedTypePolicyFactory>,
/// The start of something resembling
/// <https://html.spec.whatwg.org/multipage/#ongoing-navigation>
ongoing_navigation: Cell<OngoingNavigation>,
/// For sending timeline markers. Will be ignored if
/// no devtools server
#[no_trace]
@ -713,6 +722,49 @@ impl Window {
pub(crate) fn font_context(&self) -> &Arc<FontContext> {
&self.font_context
}
pub(crate) fn ongoing_navigation(&self) -> OngoingNavigation {
self.ongoing_navigation.get()
}
/// <https://html.spec.whatwg.org/multipage/#set-the-ongoing-navigation>
pub(crate) fn set_ongoing_navigation(&self) -> OngoingNavigation {
// Note: since this value, for now, is only used in a single `ScriptThread`,
// we just increment it (it is not a uuid), which implies not
// using a `newValue` variable.
let new_value = self.ongoing_navigation.get().0.wrapping_add(1);
// 1. If navigable's ongoing navigation is equal to newValue, then return.
// Note: cannot happen in the way it is currently used.
// TODO: 2. Inform the navigation API about aborting navigation given navigable.
// 3. Set navigable's ongoing navigation to newValue.
self.ongoing_navigation.set(OngoingNavigation(new_value));
// Note: Return the ongoing navigation for the caller to use.
OngoingNavigation(new_value)
}
/// <https://html.spec.whatwg.org/multipage/#nav-stop>
fn stop_loading(&self, can_gc: CanGc) {
// 1. Let document be navigable's active document.
let doc = self.Document();
// 2. If document's unload counter is 0,
// and navigable's ongoing navigation is a navigation ID,
// then set the ongoing navigation for navigable to null.
//
// Note: since the concept of `navigable` is nascent in Servo,
// for now we do two things:
// - increment the `ongoing_navigation`(preventing planned form navigations).
// - Send a `AbortLoadUrl` message(in case the navigation
// already started at the constellation).
self.set_ongoing_navigation();
// 3. Abort a document and its descendants given document.
doc.abort(can_gc);
}
}
// https://html.spec.whatwg.org/multipage/#atob
@ -868,9 +920,11 @@ impl WindowMethods<crate::DomTypeHolder> for Window {
// https://html.spec.whatwg.org/multipage/#dom-window-stop
fn Stop(&self, can_gc: CanGc) {
// TODO: Cancel ongoing navigation.
let doc = self.Document();
doc.abort(can_gc);
// 1. If this's navigable is null, then return.
// Note: Servo doesn't have a concept of navigable yet.
// 2. Stop loading this's navigable.
self.stop_loading(can_gc);
}
/// <https://html.spec.whatwg.org/multipage/#dom-window-focus>
@ -3097,6 +3151,7 @@ impl Window {
inherited_secure_context,
unminify_js,
),
ongoing_navigation: Default::default(),
script_chan,
layout: RefCell::new(layout),
font_context,