From dfa4aa3fd0e0409165681491f6564d7bd8769d53 Mon Sep 17 00:00:00 2001 From: ldm0 Date: Fri, 20 Nov 2026 02:27:33 +0800 Subject: [PATCH] fix: align Canvas2D arity and node event dispatch Expose the one-argument createImageData overload in the method length. Invoke registered node handlers in the non-capture listener snapshot, preserving the slot when a handler is replaced during dispatch. --- .../context_bootstrap/media_file_template.rs | 2 +- moli-renderer-v8/src/host/events.rs | 206 +++++++++++------- ...nt-internal-dispatch-regression-basic.html | 25 +++ 3 files changed, 154 insertions(+), 79 deletions(-) diff --git a/moli-renderer-v8/src/context_bootstrap/media_file_template.rs b/moli-renderer-v8/src/context_bootstrap/media_file_template.rs index ad04943fab9..ac3baa83437 100644 --- a/moli-renderer-v8/src/context_bootstrap/media_file_template.rs +++ b/moli-renderer-v8/src/context_bootstrap/media_file_template.rs @@ -320,7 +320,7 @@ struct CanvasRenderingContext2dTemplateDeclaration { #[webapi( method = "createImageData", - length = 2, + length = 1, callback = canvas_context_create_image_data_callback )] create_image_data: (), diff --git a/moli-renderer-v8/src/host/events.rs b/moli-renderer-v8/src/host/events.rs index 815261a2a13..646aa3d6d18 100644 --- a/moli-renderer-v8/src/host/events.rs +++ b/moli-renderer-v8/src/host/events.rs @@ -11,6 +11,7 @@ use moli_webapi::events::subclasses::error::construct_original_error_event; use moli_webapi::events::{construct_native_event, init::EventInit}; use std::collections::HashSet; +#[derive(Clone)] struct EventListenerEntry { id: u64, callback_id: crate::native_bridge::EventCallbackId, @@ -25,10 +26,24 @@ struct EventListenerEntry { removed: bool, } +enum EventListenerInvocation { + Listener(EventListenerEntry), + Handler(u64), +} + +impl EventListenerInvocation { + fn registration_id(&self) -> u64 { + match self { + Self::Listener(entry) => entry.id, + Self::Handler(registration_id) => *registration_id, + } + } +} + #[derive(Clone, Copy, Debug)] enum ListenerFilter { Capturing, - Bubbling, + Bubbling(Option), All, } @@ -272,7 +287,7 @@ fn invoke_event_handler_property<'s>( host_ptr: *mut PageScriptHost, target: EventTargetHandle, invocation_target_in_shadow_tree: bool, - target_object: v8::Local<'s, v8::Object>, + fallback_object: Option>, event_type: &str, event: v8::Local<'s, v8::Object>, ) { @@ -287,6 +302,9 @@ fn invoke_event_handler_property<'s>( return; } None => { + let Some(target_object) = fallback_object else { + return; + }; if !crate::context_bootstrap::event_handler_property_is_exposed( scope, target_object, @@ -482,7 +500,7 @@ fn invoke_event_handler_property<'s>( } } -fn invoke_event_target_handler_property<'s>( +fn invoke_fallback_event_handler<'s>( registry: &mut HostEventTargetRegistry, scope: &mut v8::PinScope<'s, '_>, host_ptr: *mut PageScriptHost, @@ -491,11 +509,14 @@ fn invoke_event_target_handler_property<'s>( target_object: v8::Local<'s, v8::Object>, event_type: &str, event: v8::Local<'s, v8::Object>, -) { - if matches!(target, EventTargetHandle::ChildWindow(_)) { - // Child Window event-handler properties share the native listener - // registry and are invoked in registration order by the listener phase. - return; +) -> Option { + // Child Window and registered Node handlers run in their listener phase. + if matches!(target, EventTargetHandle::ChildWindow(_)) + || registry + .node_handler_registration_id(target, event_type) + .is_some() + { + return None; } invoke_event_handler_property( registry, @@ -503,10 +524,12 @@ fn invoke_event_target_handler_property<'s>( host_ptr, target, invocation_target_in_shadow_tree, - target_object, + Some(target_object), event_type, event, ); + // A lazily compiled content attribute can register while running. + registry.node_handler_registration_id(target, event_type) } fn call_event_target_listeners_filtered<'s>( @@ -517,7 +540,7 @@ fn call_event_target_listeners_filtered<'s>( invocation_target_in_shadow_tree: bool, event_type: &str, event: v8::Local<'s, v8::Object>, - capture_only: bool, + filter: ListenerFilter, at_target: bool, ) -> std::result::Result { if let EventTargetHandle::ChildWindow(target) = target { @@ -527,7 +550,7 @@ fn call_event_target_listeners_filtered<'s>( target, event_type, event, - capture_only, + matches!(filter, ListenerFilter::Capturing), at_target, ), ); @@ -539,11 +562,7 @@ fn call_event_target_listeners_filtered<'s>( invocation_target_in_shadow_tree, event_type, event, - if capture_only { - ListenerFilter::Capturing - } else { - ListenerFilter::Bubbling - }, + filter, at_target, ) } @@ -806,6 +825,34 @@ impl HostEventTargetRegistry { callback_id } + fn node_handler_registration_id( + &self, + target: EventTargetHandle, + event_type: &str, + ) -> Option { + if !matches!(target, EventTargetHandle::Node(_)) { + return None; + } + match self.handler_properties.get(&target)?.get(event_type)? { + EventHandlerPropertyEntry::Callback { + registration_id, .. + } => Some(*registration_id), + EventHandlerPropertyEntry::Null => None, + } + } + + fn bubble_listener_filter( + &self, + target: EventTargetHandle, + event_type: &str, + invoked_fallback: Option, + ) -> ListenerFilter { + ListenerFilter::Bubbling( + self.node_handler_registration_id(target, event_type) + .filter(|®istration_id| Some(registration_id) != invoked_fallback), + ) + } + fn event_handler_property_value( &self, target: EventTargetHandle, @@ -1133,48 +1180,25 @@ impl HostEventTargetRegistry { filter: ListenerFilter, at_target: bool, ) -> std::result::Result { - let snapshot: Vec<( - u64, - crate::native_bridge::EventCallbackId, - String, - i32, - Option, - Option, - Option, - bool, - bool, - bool, - )> = { - let Some(target_map) = self.listeners.get(&target) else { - return Ok(DispatchStatus::Continue); - }; - let Some(entries) = target_map.get(event_type) else { - return Ok(DispatchStatus::Continue); - }; - entries - .iter() - .filter(|entry| !entry.removed) - .filter(|entry| match filter { - ListenerFilter::Capturing => entry.capture, - ListenerFilter::Bubbling => !entry.capture, - ListenerFilter::All => true, - }) - .map(|entry| { - ( - entry.id, - entry.callback_id, - entry.function_name.clone(), - entry.script_id, - entry.script_url.clone(), - entry.line_number, - entry.column_number, - entry.capture, - entry.once, - entry.passive, - ) - }) - .collect() - }; + let mut snapshot: Vec<_> = self + .listeners + .get(&target) + .and_then(|listeners| listeners.get(event_type)) + .into_iter() + .flatten() + .filter(|entry| !entry.removed) + .filter(|entry| match filter { + ListenerFilter::Capturing => entry.capture, + ListenerFilter::Bubbling(_) => !entry.capture, + ListenerFilter::All => true, + }) + .cloned() + .map(EventListenerInvocation::Listener) + .collect(); + if let ListenerFilter::Bubbling(Some(registration_id)) = filter { + let index = snapshot.partition_point(|entry| entry.registration_id() < registration_id); + snapshot.insert(index, EventListenerInvocation::Handler(registration_id)); + } if snapshot.is_empty() { return Ok(DispatchStatus::Continue); @@ -1192,22 +1216,45 @@ impl HostEventTargetRegistry { listener_count = snapshot.len(), ); } - for ( - listener_index, - ( - listener_id, + for (listener_index, invocation) in snapshot.into_iter().enumerate() { + let entry = match invocation { + EventListenerInvocation::Listener(entry) => entry, + EventListenerInvocation::Handler(registration_id) => { + // Replacing the handler preserves its slot. Removing and + // re-adding it creates a registration outside this snapshot. + if self.node_handler_registration_id(target, event_type) + == Some(registration_id) + { + invoke_event_handler_property( + self, + scope, + host_ptr, + target, + invocation_target_in_shadow_tree, + None, + event_type, + event, + ); + if event_internal_bool_flag(scope, event, EVENT_STOP_IMMEDIATE_SLOT) { + return Ok(DispatchStatus::StopImmediate); + } + } + continue; + } + }; + let EventListenerEntry { + id: listener_id, callback_id, function_name, script_id, script_url, line_number, column_number, - capture_flag, - is_once, - is_passive, - ), - ) in snapshot.into_iter().enumerate() - { + capture: capture_flag, + once: is_once, + passive: is_passive, + .. + } = entry; let still_registered = self .listeners .get(&target) @@ -1483,7 +1530,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( invocation_targets_in_shadow_tree.contains(ancestor), &event_type, event, - true, + ListenerFilter::Capturing, false, )?; if status == DispatchStatus::StopImmediate || status == DispatchStatus::StopPropagation @@ -1526,7 +1573,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( )?; set_event_phase(scope, event, 2); - invoke_event_target_handler_property( + let invoked_fallback = invoke_fallback_event_handler( registry, scope, host_ptr, @@ -1568,7 +1615,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( invocation_targets_in_shadow_tree.contains(&dispatch_target), &event_type, event, - true, + ListenerFilter::Capturing, true, )?; if status == DispatchStatus::StopPropagation { @@ -1577,6 +1624,8 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( if status == DispatchStatus::StopImmediate { stopped = true; } else if !stopped { + let filter = + registry.bubble_listener_filter(dispatch_target, &event_type, invoked_fallback); let status = call_event_target_listeners_filtered( registry, scope, @@ -1585,7 +1634,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( invocation_targets_in_shadow_tree.contains(&dispatch_target), &event_type, event, - false, + filter, true, )?; if status == DispatchStatus::StopImmediate @@ -1647,7 +1696,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( invocation_targets_in_shadow_tree.contains(ancestor), &event_type, event, - true, + ListenerFilter::Capturing, true, )?; if status == DispatchStatus::StopImmediate || status == DispatchStatus::StopPropagation @@ -1663,7 +1712,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( invocation_targets_in_shadow_tree.contains(ancestor), &event_type, event, - false, + ListenerFilter::Bubbling(None), true, )?; if status == DispatchStatus::StopImmediate || status == DispatchStatus::StopPropagation @@ -1725,7 +1774,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( event_phase_for_current_target(host_ptr, original_target, *ancestor, 3), ); - invoke_event_target_handler_property( + let invoked_fallback = invoke_fallback_event_handler( registry, scope, host_ptr, @@ -1738,6 +1787,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( if event_internal_bool_flag(scope, event, EVENT_STOP_IMMEDIATE_SLOT) { break; } + let filter = registry.bubble_listener_filter(*ancestor, &event_type, invoked_fallback); let status = call_event_target_listeners_filtered( registry, scope, @@ -1746,7 +1796,7 @@ fn dispatch_public_event_with_original_target_impl<'s, 'i>( invocation_targets_in_shadow_tree.contains(ancestor), &event_type, event, - false, + filter, false, )?; if status == DispatchStatus::StopImmediate @@ -1884,7 +1934,7 @@ fn run_host_event_dispatch<'s>( host_ptr, dispatch_target, invocation_target_in_shadow_tree, - target_object, + Some(target_object), event_type, event, ); @@ -1921,7 +1971,7 @@ fn run_host_event_dispatch<'s>( invocation_target_in_shadow_tree, event_type, event, - ListenerFilter::Bubbling, + ListenerFilter::Bubbling(None), true, )?; } diff --git a/moli-wpt-compat/fixtures/wpt/ported/dom/event-internal-dispatch-regression-basic.html b/moli-wpt-compat/fixtures/wpt/ported/dom/event-internal-dispatch-regression-basic.html index 08ef89fa6f5..dc4534baf20 100644 --- a/moli-wpt-compat/fixtures/wpt/ported/dom/event-internal-dispatch-regression-basic.html +++ b/moli-wpt-compat/fixtures/wpt/ported/dom/event-internal-dispatch-regression-basic.html @@ -116,4 +116,29 @@ test(function () { "target-bubble", ]); }, "stopPropagation from an at-target event handler keeps later target listeners and skips ancestors"); + +test(function () { + const target = document.createElement("button"); + const calls = []; + + target.addEventListener("click", function () { + calls.push("earlier-listener"); + target.onclick = function (event) { + calls.push("replacement-handler"); + event.stopImmediatePropagation(); + }; + }); + target.onclick = function () { + calls.push("initial-handler"); + }; + target.addEventListener("click", function () { + calls.push("later-listener"); + }); + target.addEventListener("click", function () { + calls.push("capture"); + }, { capture: true }); + + target.dispatchEvent(new Event("click")); + assert_array_equals(calls, ["capture", "earlier-listener", "replacement-handler"]); +}, "A replaced native handler keeps its listener slot and can stop later listeners");