Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

perf(events): reuse resolved simple listener registries

ldm04b3bd91aceff
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs
index 01bd6647e..cca3b4d8e 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target.rs
@@ -27,11 +27,18 @@ pub(crate) use listeners::{
simple_object_event_remove_listener_value_for_type, simple_object_event_set_handler,
simple_object_has_event_listeners,
};
+use listeners::{
+ simple_object_event_listeners_snapshot_in_registry,
+ simple_object_event_set_handler_in_registry,
+ simple_object_event_target_add_listener_for_target,
+ simple_object_event_target_remove_listener_for_target,
+};
pub(crate) use listeners::{
- simple_object_event_target_add_listener, simple_object_event_target_add_listener_for_target,
- simple_object_event_target_register_webidl_listener,
+ simple_object_event_target_add_listener, simple_object_event_target_register_webidl_listener,
simple_object_event_target_remove_listener,
- simple_object_event_target_remove_listener_for_target,
+};
+use state::{
+ ResolvedSimpleEventTarget, SimpleEventListenerRegistry, resolve_simple_event_target,
+ simple_object_event_listener_registry,
};
pub(crate) use state::{initialize_simple_event_target, is_simple_event_target};
-use state::{resolve_simple_event_target, simple_object_event_listener_registry};
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs
index d3501f8d9..0449dff37 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/callbacks.rs
@@ -8,7 +8,12 @@ pub(crate) fn simple_event_target_add_event_listener_callback<'s>(
let Some(target) = resolve_simple_event_target(scope, args.this()) else {
return;
};
- simple_object_event_target_add_listener_for_target(scope, &args, target.listener_owner);
+ simple_object_event_target_add_listener_for_target(
+ scope,
+ &args,
+ target.identity.listener_owner,
+ Some(target.registry),
+ );
}
pub(crate) fn simple_event_target_remove_event_listener_callback<'s>(
@@ -19,7 +24,12 @@ pub(crate) fn simple_event_target_remove_event_listener_callback<'s>(
let Some(target) = resolve_simple_event_target(scope, args.this()) else {
return;
};
- simple_object_event_target_remove_listener_for_target(scope, &args, target.listener_owner);
+ simple_object_event_target_remove_listener_for_target(
+ scope,
+ &args,
+ target.identity.listener_owner,
+ Some(target.registry),
+ );
}
pub(crate) fn simple_event_target_dispatch_event_callback<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rs
index 923953bfa..63ec05e7a 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/dispatch.rs
@@ -23,7 +23,7 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn
>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
- target: ResolvedEventTarget<'s>,
+ target: ResolvedSimpleEventTarget<'s>,
rv: &mut v8::ReturnValue<'s, v8::Value>,
) {
let Some((event, event_type)) =
@@ -36,7 +36,14 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn
return;
};
- let dispatch_result = dispatch_resolved_event(scope, target, &event_type, event, None);
+ let dispatch_result = dispatch_resolved_event(
+ scope,
+ target.identity,
+ Some(target.registry),
+ &event_type,
+ event,
+ None,
+ );
rv.set_bool(dispatch_result.uncanceled);
}
@@ -68,17 +75,18 @@ pub(crate) fn dispatch_simple_event_target_event_collecting_errors<'s>(
dispatched: false,
};
};
- dispatch_resolved_event(scope, target, event_type, event, callback_errors)
+ let registry = SimpleEventListenerRegistry::from_owner(scope, target.listener_owner);
+ dispatch_resolved_event(scope, target, registry, event_type, event, callback_errors)
}
fn dispatch_resolved_event<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: ResolvedEventTarget<'s>,
+ registry: Option<SimpleEventListenerRegistry<'s>>,
event_type: &str,
event: v8::Local<'s, v8::Object>,
mut callback_errors: Option<&mut Vec<crate::exception_reporting::V8ExceptionReport>>,
) -> SimpleEventDispatchResult {
- let listener_owner = target.listener_owner;
let target = target.dispatch_target;
let mut dispatched = false;
let can_invoke =
@@ -92,18 +100,19 @@ fn dispatch_resolved_event<'s>(
} else {
None
};
- if can_invoke {
+ if let (true, Some(registry)) = (can_invoke, registry) {
'phases: for capture_phase in [true, false] {
// DOM clones the listener list for each invocation phase. A listener
// added during capture can participate in the subsequent bubble phase.
+ // Reuse only the registry; fetch the current array for each phase
+ // and each registration check after callbacks mutate that array.
let listeners =
- simple_object_event_listeners_snapshot(scope, listener_owner, event_type);
+ simple_object_event_listeners_snapshot_in_registry(scope, registry, event_type);
for listener in listeners
.iter()
.filter(|listener| listener.capture == capture_phase)
{
- let Some(listener) =
- listener.prepare_for_invocation(scope, listener_owner, event_type)
+ let Some(listener) = listener.prepare_in_registry(scope, registry, event_type)
else {
continue;
};
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs
index 9d3ed3c77..685aba1a1 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs
@@ -12,7 +12,10 @@ pub(crate) fn simple_event_target_handler_getter_callback<'s>(
let Some((target, property)) = handler_callback_data(scope, &args) else {
return;
};
- rv.set(get_private_value(scope, target, &property).unwrap_or_else(|| v8::null(scope).into()));
+ rv.set(
+ get_private_value(scope, target.identity.handler_owner, &property)
+ .unwrap_or_else(|| v8::null(scope).into()),
+ );
}
pub(crate) fn simple_event_target_handler_setter_callback<'s>(
@@ -23,26 +26,27 @@ pub(crate) fn simple_event_target_handler_setter_callback<'s>(
let Some((target, property)) = handler_callback_data(scope, &args) else {
return;
};
- simple_object_event_set_handler(
+ simple_object_event_set_handler_in_registry(
scope,
- target,
+ target.identity.handler_owner,
property.strip_prefix("on").expect("event handler property"),
&property,
args.get(0),
+ Some(target.registry),
);
}
fn handler_callback_data<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
-) -> Option<(v8::Local<'s, v8::Object>, String)> {
+) -> Option<(ResolvedSimpleEventTarget<'s>, String)> {
let Some(target) = resolve_simple_event_target(scope, args.this()) else {
throw_type_error(scope, "Illegal invocation");
return None;
};
v8::Local::<v8::String>::try_from(args.data())
.ok()
- .map(|property| (target.handler_owner, property.to_rust_string_lossy(scope)))
+ .map(|property| (target, property.to_rust_string_lossy(scope)))
}
/// Install explicit EventHandler accessors on object-backed Window surfaces.
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs
index 3bb476a9f..d4a1b75a7 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/listeners.rs
@@ -118,10 +118,20 @@ impl<'s> SimpleObjectEventListenerSnapshot<'s> {
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Object>,
event_type: &str,
+ ) -> Option<Self> {
+ let registry = simple_object_event_listener_registry(scope, target)?;
+ self.prepare_in_registry(scope, registry, event_type)
+ }
+
+ pub(super) fn prepare_in_registry(
+ &self,
+ scope: &mut v8::PinScope<'s, '_>,
+ registry: SimpleEventListenerRegistry<'s>,
+ event_type: &str,
) -> Option<Self> {
// Removing and re-adding the same callback creates a different entry.
// The removed entry must stay inactive in an existing dispatch snapshot.
- if !simple_object_event_listener_entry_registered(scope, target, event_type, self.entry) {
+ if !simple_object_event_listener_entry_registered(scope, registry, event_type, self.entry) {
return None;
}
let listener = if self.handler_slot.is_some() {
@@ -132,9 +142,9 @@ impl<'s> SimpleObjectEventListenerSnapshot<'s> {
self.clone()
};
if listener.once {
- simple_object_event_remove_listener_value_for_type(
+ simple_object_event_remove_listener_from_registry(
scope,
- target,
+ registry,
event_type,
listener.original,
listener.capture,
@@ -180,13 +190,14 @@ pub(crate) fn simple_object_event_target_add_listener<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
) {
- simple_object_event_target_add_listener_for_target(scope, args, args.this());
+ simple_object_event_target_add_listener_for_target(scope, args, args.this(), None);
}
-pub(crate) fn simple_object_event_target_add_listener_for_target<'s>(
+pub(super) fn simple_object_event_target_add_listener_for_target<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
target: v8::Local<'s, v8::Object>,
+ registry: Option<SimpleEventListenerRegistry<'s>>,
) {
let Some(call) = parse_listener_args::<AddEventListenerArgs>(scope, args, "addEventListener")
else {
@@ -203,6 +214,7 @@ pub(crate) fn simple_object_event_target_add_listener_for_target<'s>(
listener,
call.options.options,
call.options.signal,
+ registry,
);
}
@@ -223,7 +235,7 @@ pub(crate) fn simple_object_event_target_register_webidl_listener<'s>(
) {
let listener = simple_object_event_listener_parts(scope, listener);
simple_object_event_target_register_resolved_listener(
- scope, target, event_type, listener, options, None,
+ scope, target, event_type, listener, options, None, None,
);
}
@@ -234,11 +246,16 @@ fn simple_object_event_target_register_resolved_listener<'s>(
listener: SimpleObjectResolvedEventListener<'s>,
options: webidl::EventListenerOptions,
signal: Option<ResolvedAbortSignal<'s>>,
+ registry: Option<SimpleEventListenerRegistry<'s>>,
) {
if signal.is_some_and(|signal| signal.is_aborted(scope)) {
return;
}
- let Some(listeners) = simple_object_event_listener_array(scope, target, &event_type, true)
+ let Some(registry) = registry.or_else(|| simple_object_event_listener_registry(scope, target))
+ else {
+ return;
+ };
+ let Some(listeners) = simple_object_event_listener_array(scope, registry, &event_type, true)
else {
return;
};
@@ -266,7 +283,7 @@ fn simple_object_event_target_register_resolved_listener<'s>(
None
};
if added_entry.is_some() {
- ensure_simple_object_event_type_order(scope, target, &event_type);
+ ensure_simple_object_event_type_order(scope, registry, &event_type);
}
if let (Some(entry), Some(signal)) = (added_entry, signal)
&& !register_simple_object_abort_listener(
@@ -279,9 +296,9 @@ fn simple_object_event_target_register_resolved_listener<'s>(
options.capture,
)
{
- simple_object_event_remove_listener_value_for_type(
+ simple_object_event_remove_listener_from_registry(
scope,
- target,
+ registry,
&event_type,
listener.original,
options.capture,
@@ -296,13 +313,14 @@ pub(crate) fn simple_object_event_target_remove_listener<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
) {
- simple_object_event_target_remove_listener_for_target(scope, args, args.this());
+ simple_object_event_target_remove_listener_for_target(scope, args, args.this(), None);
}
-pub(crate) fn simple_object_event_target_remove_listener_for_target<'s>(
+pub(super) fn simple_object_event_target_remove_listener_for_target<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: &v8::FunctionCallbackArguments<'s>,
target: v8::Local<'s, v8::Object>,
+ registry: Option<SimpleEventListenerRegistry<'s>>,
) {
let Some(call) =
parse_listener_args::<RemoveEventListenerArgs>(scope, args, "removeEventListener")
@@ -313,9 +331,13 @@ pub(crate) fn simple_object_event_target_remove_listener_for_target<'s>(
return;
};
let listener = listener.value(scope);
- simple_object_event_remove_listener_value_for_type(
+ let Some(registry) = registry.or_else(|| simple_object_event_listener_registry(scope, target))
+ else {
+ return;
+ };
+ simple_object_event_remove_listener_from_registry(
scope,
- target,
+ registry,
&call.event_type,
listener,
call.options.capture,
@@ -355,12 +377,15 @@ fn simple_object_abort_remove_listener_callback<'s>(
let capture = data
.get(scope, v8str(scope, "capture").into())
.is_some_and(|value| value.boolean_value(scope));
- if !simple_object_event_listener_entry_registered(scope, target, &event_type, entry) {
+ let Some(registry) = simple_object_event_listener_registry(scope, target) else {
+ return;
+ };
+ if !simple_object_event_listener_entry_registered(scope, registry, &event_type, entry) {
return;
}
- simple_object_event_remove_listener_value_for_type(
+ simple_object_event_remove_listener_from_registry(
scope,
- target,
+ registry,
&event_type,
listener,
capture,
@@ -416,11 +441,11 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn
's,
>(
scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
+ registry: SimpleEventListenerRegistry<'s>,
event_type: &str,
create: bool,
) -> Option<v8::Local<'s, v8::Array>> {
- let registry = simple_object_event_listener_registry(scope, target)?;
+ let registry = registry.0;
if let Some(listeners) = object_property_as_array(scope, registry, event_type) {
return Some(listeners);
}
@@ -441,7 +466,18 @@ pub(crate) fn simple_object_event_listeners_snapshot<'s>(
target: v8::Local<'s, v8::Object>,
event_type: &str,
) -> Vec<SimpleObjectEventListenerSnapshot<'s>> {
- let Some(listeners) = simple_object_event_listener_array(scope, target, event_type, false)
+ let Some(registry) = simple_object_event_listener_registry(scope, target) else {
+ return Vec::new();
+ };
+ simple_object_event_listeners_snapshot_in_registry(scope, registry, event_type)
+}
+
+pub(super) fn simple_object_event_listeners_snapshot_in_registry<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ registry: SimpleEventListenerRegistry<'s>,
+ event_type: &str,
+) -> Vec<SimpleObjectEventListenerSnapshot<'s>> {
+ let Some(listeners) = simple_object_event_listener_array(scope, registry, event_type, false)
else {
return Vec::new();
};
@@ -465,7 +501,7 @@ pub(crate) fn simple_object_has_event_listeners<'s>(
let Some(registry) = simple_object_event_listener_registry(scope, target) else {
return false;
};
- let Some(event_types) = simple_object_event_type_order(scope, registry, false) else {
+ let Some(event_types) = simple_object_event_type_order(scope, registry.0, false) else {
return false;
};
for index in 0..event_types.length() {
@@ -476,7 +512,9 @@ pub(crate) fn simple_object_has_event_listeners<'s>(
else {
continue;
};
- if !simple_object_event_listeners_snapshot(scope, target, &event_type).is_empty() {
+ if !simple_object_event_listeners_snapshot_in_registry(scope, registry, &event_type)
+ .is_empty()
+ {
return true;
}
}
@@ -490,7 +528,7 @@ pub(crate) fn simple_event_target_inspector_listener_snapshots<'s>(
let Some(registry) = simple_object_event_listener_registry(scope, target) else {
return Vec::new();
};
- let Some(event_types) = simple_object_event_type_order(scope, registry, false) else {
+ let Some(event_types) = simple_object_event_type_order(scope, registry.0, false) else {
return Vec::new();
};
let mut snapshots = Vec::new();
@@ -502,7 +540,9 @@ pub(crate) fn simple_event_target_inspector_listener_snapshots<'s>(
else {
continue;
};
- for listener in simple_object_event_listeners_snapshot(scope, target, &event_type) {
+ for listener in
+ simple_object_event_listeners_snapshot_in_registry(scope, registry, &event_type)
+ {
let original = if listener.handler_slot.is_some() {
listener.callback.into()
} else {
@@ -531,6 +571,25 @@ pub(crate) fn simple_object_event_set_handler<'s>(
event_type: &str,
handler_slot_name: &str,
value: v8::Local<'s, v8::Value>,
+) {
+ let registry = simple_object_event_listener_registry(scope, target);
+ simple_object_event_set_handler_in_registry(
+ scope,
+ target,
+ event_type,
+ handler_slot_name,
+ value,
+ registry,
+ );
+}
+
+pub(super) fn simple_object_event_set_handler_in_registry<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ target: v8::Local<'s, v8::Object>,
+ event_type: &str,
+ handler_slot_name: &str,
+ value: v8::Local<'s, v8::Value>,
+ registry: Option<SimpleEventListenerRegistry<'s>>,
) {
// EventHandler uses [LegacyTreatNonObjectAsNull]. Non-callable objects still
// activate the handler, but must never be treated as handleEvent listeners.
@@ -542,7 +601,10 @@ pub(crate) fn simple_object_event_set_handler<'s>(
handler_slot_name,
callback.map_or_else(|| v8::null(scope).into(), |callback| callback.into()),
);
- let Some(listeners) = simple_object_event_listener_array(scope, target, event_type, active)
+ let Some(registry) = registry else {
+ return;
+ };
+ let Some(listeners) = simple_object_event_listener_array(scope, registry, event_type, active)
else {
return;
};
@@ -584,7 +646,7 @@ pub(crate) fn simple_object_event_set_handler<'s>(
incumbent_context_anchor.into(),
);
}
- ensure_simple_object_event_type_order(scope, target, event_type);
+ ensure_simple_object_event_type_order(scope, registry, event_type);
return;
}
}
@@ -597,7 +659,7 @@ pub(crate) fn simple_object_event_set_handler<'s>(
);
set_private_value(scope, entry, HANDLER_TARGET_SLOT, target.into());
let _ = listeners.set_index(scope, listeners.length(), entry.into());
- ensure_simple_object_event_type_order(scope, target, event_type);
+ ensure_simple_object_event_type_order(scope, registry, event_type);
return;
}
@@ -614,12 +676,10 @@ pub(crate) fn simple_object_event_set_handler<'s>(
}
let _ = next.set_index(scope, next.length(), candidate);
}
- if let Some(registry) = simple_object_event_listener_registry(scope, target)
- && let Some(key) = v8_string(scope, event_type)
- {
- let _ = registry.set(scope, key.into(), next.into());
+ if let Some(key) = v8_string(scope, event_type) {
+ let _ = registry.0.set(scope, key.into(), next.into());
if next.length() == 0 {
- remove_simple_object_event_type_order(scope, registry, event_type);
+ remove_simple_object_event_type_order(scope, registry.0, event_type);
}
}
}
@@ -645,6 +705,19 @@ pub(crate) fn simple_object_event_remove_listener_value_for_type<'s>(
let Some(registry) = simple_object_event_listener_registry(scope, target) else {
return;
};
+ simple_object_event_remove_listener_from_registry(
+ scope, registry, event_type, listener, capture,
+ );
+}
+
+fn simple_object_event_remove_listener_from_registry<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ registry: SimpleEventListenerRegistry<'s>,
+ event_type: &str,
+ listener: v8::Local<'s, v8::Value>,
+ capture: bool,
+) {
+ let registry = registry.0;
let Some(current) = object_property_as_array(scope, registry, event_type) else {
return;
};
@@ -734,13 +807,10 @@ fn simple_object_event_type_order<'s>(
fn ensure_simple_object_event_type_order<'s>(
scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
+ registry: SimpleEventListenerRegistry<'s>,
event_type: &str,
) {
- let Some(registry) = simple_object_event_listener_registry(scope, target) else {
- return;
- };
- let Some(order) = simple_object_event_type_order(scope, registry, true) else {
+ let Some(order) = simple_object_event_type_order(scope, registry.0, true) else {
return;
};
for index in 0..order.length() {
@@ -919,11 +989,11 @@ fn simple_object_event_listener_array_contains_entry(
fn simple_object_event_listener_entry_registered<'s>(
scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
+ registry: SimpleEventListenerRegistry<'s>,
event_type: &str,
entry: v8::Local<'s, v8::Object>,
) -> bool {
- let Some(listeners) = simple_object_event_listener_array(scope, target, event_type, false)
+ let Some(listeners) = simple_object_event_listener_array(scope, registry, event_type, false)
else {
return false;
};
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs
index 592dd5751..00c6be022 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/state.rs
@@ -4,6 +4,26 @@ use crate::context_bootstrap::shared_event_targets::{
};
use crate::util::{get_private_object, new_null_prototype_object, set_private_value};
+// A call-local view, not an event-type array snapshot. Listener arrays can be
+// replaced by removals or reentrant callbacks while the registry stays shared.
+#[derive(Clone, Copy)]
+pub(super) struct SimpleEventListenerRegistry<'s>(pub(super) v8::Local<'s, v8::Object>);
+
+impl<'s> SimpleEventListenerRegistry<'s> {
+ pub(super) fn from_owner(
+ scope: &mut v8::PinScope<'s, '_>,
+ owner: v8::Local<'s, v8::Object>,
+ ) -> Option<Self> {
+ // Read only the owner's own state; prototypes cannot supply a registry.
+ get_private_object(scope, owner, SIMPLE_EVENT_TARGET_LISTENERS_SLOT).map(Self)
+ }
+}
+
+pub(super) struct ResolvedSimpleEventTarget<'s> {
+ pub(super) identity: ResolvedEventTarget<'s>,
+ pub(super) registry: SimpleEventListenerRegistry<'s>,
+}
+
pub(crate) fn initialize_simple_event_target<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Object>,
@@ -30,24 +50,18 @@ pub(crate) fn is_simple_event_target<'s>(
pub(super) fn resolve_simple_event_target<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Object>,
-) -> Option<ResolvedEventTarget<'s>> {
+) -> Option<ResolvedSimpleEventTarget<'s>> {
// Resolve registered native Proxies only for the simple-target branch.
// DOM and Window targets keep their existing receiver resolution.
- let target = resolve_event_target(scope, target)?;
- get_private_object(
- scope,
- target.listener_owner,
- SIMPLE_EVENT_TARGET_LISTENERS_SLOT,
- )?;
- Some(target)
+ let identity = resolve_event_target(scope, target)?;
+ let registry = SimpleEventListenerRegistry::from_owner(scope, identity.listener_owner)?;
+ Some(ResolvedSimpleEventTarget { identity, registry })
}
pub(super) fn simple_object_event_listener_registry<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Object>,
-) -> Option<v8::Local<'s, v8::Object>> {
+) -> Option<SimpleEventListenerRegistry<'s>> {
let target = shared_target_owner(scope, target);
- // Read only the target's own private state. Looking through prototypes would
- // let instances inherit another target's listener list and receiver identity.
- get_private_object(scope, target, SIMPLE_EVENT_TARGET_LISTENERS_SLOT)
+ SimpleEventListenerRegistry::from_owner(scope, target)
}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/event_target_prototype.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/event_target_prototype.rs
index 8f12a1e83..9b41a1498 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/event_target_prototype.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/event_target_prototype.rs
@@ -558,3 +558,53 @@ fn model_context_native_aliases_project_shared_listener_targets_into_worlds() {
"[true]"
);
}
+
+#[test]
+fn simple_event_target_registry_reuse_preserves_reentrant_listener_mutations() {
+ let mut vm = new_storage_html_test_vm("https://event-listener-registry.test/");
+ assert_eq!(vm.eval(r#"(() => {
+ for (const make of [() => new EventTarget(), () => new FileReader()]) {
+ const target = make();
+ const trace = [];
+ const controller = new AbortController();
+ const victim = () => trace.push('victim');
+ const late = () => trace.push('late');
+ target.addEventListener('probe', () => {
+ trace.push('capture');
+ }, {capture: true, once: true});
+ target.addEventListener('probe', () => {
+ trace.push('first');
+ target.removeEventListener('probe', victim);
+ target.addEventListener('probe', victim);
+ controller.abort();
+ }, {once: true});
+ target.addEventListener('probe', victim);
+ target.addEventListener('probe', () => trace.push('aborted'), {signal: controller.signal});
+ target.addEventListener('probe', () => {
+ trace.push('once');
+ target.dispatchEvent(new Event('probe'));
+ }, {once: true});
+ target.addEventListener('probe', late);
+ target.dispatchEvent(new Event('probe'));
+ if (trace.join(',') !== 'capture,first,once,late,victim,late') return false;
+ trace.length = 0;
+ target.dispatchEvent(new Event('probe'));
+ if (trace.join(',') !== 'late,victim') return false;
+ target.removeEventListener('probe', late);
+ target.removeEventListener('probe', victim);
+ trace.length = 0;
+ target.dispatchEvent(new Event('probe'));
+ if (trace.length !== 0) return false;
+ }
+ const reader = new FileReader();
+ const trace = [];
+ reader.addEventListener('load', () => {
+ reader.onload = () => trace.push('new');
+ }, {once: true});
+ reader.onload = () => trace.push('old');
+ reader.dispatchEvent(new Event('load'));
+ reader.onload = null;
+ reader.dispatchEvent(new Event('load'));
+ return trace.join(',') === 'new';
+ })()"#).unwrap(), "true");
+}