Skip to content

armgit / moli

Public Imported from GitHub
0

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

refactor(events): unify event handler registration and dispatch

ldm0d1124032c3bb
diff --git a/moli-renderer-v8/src/context_bootstrap.rs b/moli-renderer-v8/src/context_bootstrap.rs
index c37126d96..2258c7fbd 100644
--- a/moli-renderer-v8/src/context_bootstrap.rs
+++ b/moli-renderer-v8/src/context_bootstrap.rs
@@ -338,12 +338,13 @@ pub(crate) use self::media_queries::{
SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,
dispatch_media_query_list_change_events, dispatch_simple_event_target_event,
dispatch_simple_event_target_event_collecting_errors,
- evaluate_match_media_query_list_with_viewport, install_simple_event_target_methods,
- install_simple_event_target_ordered_handlers, invoke_simple_event_listener,
+ evaluate_match_media_query_list_with_viewport, install_simple_event_target_handlers,
+ install_simple_event_target_methods, invoke_simple_event_listener,
mark_simple_event_target_slot, simple_event_target_add_event_listener_callback,
- simple_event_target_dispatch_event_callback, simple_event_target_inspector_listener_snapshots,
+ simple_event_target_dispatch_event_callback, simple_event_target_handler_getter_callback,
+ simple_event_target_handler_setter_callback, simple_event_target_inspector_listener_snapshots,
simple_event_target_remove_event_listener_callback, simple_event_target_slot_name,
- simple_object_event_listeners_snapshot, simple_object_event_set_ordered_handler,
+ simple_object_event_listeners_snapshot, simple_object_event_set_handler,
simple_object_event_target_add_listener, simple_object_event_target_remove_listener,
simple_object_has_event_listeners,
};
@@ -408,6 +409,7 @@ pub(crate) use self::runtime_state::{
ORIGINAL_WEBASSEMBLY_GLOBAL_VALUE_GETTER_SLOT, ORIGINAL_WEBASSEMBLY_INSTANCE_CONSTRUCTOR_SLOT,
ORIGINAL_WEBASSEMBLY_LINK_ERROR_CONSTRUCTOR_SLOT,
};
+pub(crate) use self::shared::SIMPLE_EVENT_TARGET_SLOT;
#[cfg(test)]
pub(crate) use self::shared::structured_deserialize_value;
#[cfg(test)]
@@ -427,9 +429,6 @@ pub(crate) use self::shared::{
structured_serialize_value_for_window_post_message_options,
wasm_module_message_allowed_for_target, wasm_module_message_allowed_for_target_origin,
};
-pub(crate) use self::shared::{
- SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT,
-};
pub(crate) use self::shared::{
console_arg_remote_object_json, current_console_stack,
install_console_message_buffers_for_context,
@@ -486,10 +485,12 @@ pub(crate) use self::webassembly_runtime::{
};
pub(crate) use self::websocket::{WebSocketDispatchResult, dispatch_websocket_event};
pub(crate) use self::window_events::{
- WINDOW_EVENT_HANDLER_PROPERTIES, dispatch_window_error_event_with_details,
- dispatch_window_promise_rejection_event, dispatch_window_report_error_message,
- event_handler_property_is_exposed, set_window_body_onerror_handler_compiled,
- set_window_onerror_handler_value, window_body_onerror_handler_is_compiled,
+ WINDOW_EVENT_HANDLER_PROPERTIES, clear_simple_window_event_handler_values,
+ dispatch_window_error_event_with_details, dispatch_window_promise_rejection_event,
+ dispatch_window_report_error_message, event_handler_property_is_exposed,
+ install_simple_window_event_handlers, is_window_event_handler_property,
+ set_window_body_onerror_handler_compiled, set_window_onerror_handler_value,
+ window_body_onerror_handler_is_compiled,
};
#[cfg(test)]
pub(crate) use self::window_lazy_surface::window_lazy_surface_diagnostics;
diff --git a/moli-renderer-v8/src/context_bootstrap/abort_signal_events.rs b/moli-renderer-v8/src/context_bootstrap/abort_signal_events.rs
index 6d7048431..5b3556fc5 100644
--- a/moli-renderer-v8/src/context_bootstrap/abort_signal_events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/abort_signal_events.rs
@@ -1,7 +1,6 @@
use super::{
- construct_original_event, dispatch_simple_event_target_event,
- install_simple_event_target_ordered_handlers, mark_simple_event_target_slot,
- simple_object_event_set_ordered_handler,
+ construct_original_event, dispatch_simple_event_target_event, mark_simple_event_target_slot,
+ simple_object_event_set_handler,
};
use crate::util::{get_private_value, set_private_value};
@@ -12,7 +11,7 @@ const ONABORT_SLOT: &str = "__moliAbortSignalOnabort";
// EventTarget state uses the same registry for inherited methods and native abort.
pub(crate) fn initialize<'s>(scope: &mut v8::PinScope<'s, '_>, signal: v8::Local<'s, v8::Object>) {
mark_simple_event_target_slot(scope, signal, LISTENERS_SLOT);
- install_simple_event_target_ordered_handlers(scope, signal);
+
set_private_value(scope, signal, ONABORT_SLOT, v8::null(scope).into());
}
@@ -46,20 +45,13 @@ pub(crate) fn onabort_setter<'s>(
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- let active = args.get(0).is_object();
- let value = if active {
- args.get(0)
- } else {
- v8::null(scope).into()
- };
let signal = args.this();
- set_private_value(scope, signal, ONABORT_SLOT, value);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
signal,
LISTENERS_SLOT,
"abort",
ONABORT_SLOT,
- active,
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/broadcast_channel.rs b/moli-renderer-v8/src/context_bootstrap/broadcast_channel.rs
index f3d33f524..270013584 100644
--- a/moli-renderer-v8/src/context_bootstrap/broadcast_channel.rs
+++ b/moli-renderer-v8/src/context_bootstrap/broadcast_channel.rs
@@ -47,9 +47,6 @@ struct BroadcastChannelObjectDeclaration<'scope> {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = BROADCAST_CHANNEL_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
-
#[webapi(
method,
enumerable,
@@ -519,20 +516,13 @@ fn broadcast_channel_event_handler_setter_callback<'s>(
) else {
return;
};
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, args.this(), handler.slot_name, stored);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
BROADCAST_CHANNEL_LISTENERS_SLOT,
handler.event_type,
handler.slot_name,
- stored.is_object(),
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/constructors/core.rs b/moli-renderer-v8/src/context_bootstrap/constructors/core.rs
index 10d059d46..bb6d498cd 100644
--- a/moli-renderer-v8/src/context_bootstrap/constructors/core.rs
+++ b/moli-renderer-v8/src/context_bootstrap/constructors/core.rs
@@ -14,7 +14,7 @@ pub(in crate::context_bootstrap) fn event_target_constructor_callback<'s>(
return;
}
let target = args.this();
- install_simple_event_target_methods(scope, target, "__moliEventTargetListeners", false);
+ install_simple_event_target_methods(scope, target, "__moliEventTargetListeners");
rv.set(target.into());
}
diff --git a/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/events.rs b/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/events.rs
index 00aa56a8c..076cd51c2 100644
--- a/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/css_fontface_runtime/events.rs
@@ -106,7 +106,6 @@ pub(super) fn initialize_font_face_set_event_target<'s>(
for handler in FONT_FACE_SET_EVENT_HANDLERS {
set_private_value(scope, object, handler.slot_name, v8::null(scope).into());
}
- install_simple_event_target_ordered_handlers(scope, object);
}
fn font_face_set_event_handler_getter<'s>(
@@ -142,21 +141,13 @@ fn font_face_set_event_handler_setter<'s>(
) else {
return;
};
- let value = args.get(0);
- let active = value.is_object();
- let stored = if active {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, args.this(), handler.slot_name, stored);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
FONT_FACE_SET_LISTENERS_SLOT,
handler.event_type,
handler.slot_name,
- active,
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/exposed_interfaces/tests/finalization.rs b/moli-renderer-v8/src/context_bootstrap/exposed_interfaces/tests/finalization.rs
index f14b62839..8120e8e0f 100644
--- a/moli-renderer-v8/src/context_bootstrap/exposed_interfaces/tests/finalization.rs
+++ b/moli-renderer-v8/src/context_bootstrap/exposed_interfaces/tests/finalization.rs
@@ -275,16 +275,6 @@ fn materialized_xhr_event_target_initializes_its_private_state() {
.expect("listener slot string")
.to_rust_string_lossy(scope);
assert_eq!(listener_slot, "__moliXhrEventTargetListeners");
- for slot in [
- crate::context_bootstrap::SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT,
- "__moliXhrUsesSimpleEventTarget",
- ] {
- assert!(
- get_private_value(scope, interface.prototype, slot)
- .expect("event target marker")
- .is_true()
- );
- }
assert!(matches!(
&*interface.realm.entry(interface.id).unwrap(),
RealmInterfaceEntry::Ready
diff --git a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs
index 6cd24963a..d7c3463f0 100644
--- a/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs
+++ b/moli-renderer-v8/src/context_bootstrap/file_api/file_reader/state.rs
@@ -22,24 +22,6 @@ struct FileReaderObjectDeclaration {
#[webapi(slot = FILE_READER_ERROR_SLOT, init = "null")]
error: (),
- #[webapi(data_property = "onloadstart", init = "null")]
- onloadstart: (),
-
- #[webapi(data_property = "onprogress", init = "null")]
- onprogress: (),
-
- #[webapi(data_property = "onload", init = "null")]
- onload: (),
-
- #[webapi(data_property = "onloadend", init = "null")]
- onloadend: (),
-
- #[webapi(data_property = "onerror", init = "null")]
- onerror: (),
-
- #[webapi(data_property = "onabort", init = "null")]
- onabort: (),
-
#[webapi(slot = FILE_READER_LISTENERS_SLOT, init = "null_object")]
listeners: (),
@@ -62,6 +44,67 @@ struct FileReaderObjectDeclaration {
#[derive(WebApiFunctionTemplate)]
#[webapi(interface = web_api_interfaces::FileReader)]
struct FileReaderPrototypeAccessorsDeclaration {
+ #[webapi(
+ accessor_property = "onloadstart",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onloadstart"),
+ setter_data = v8str(scope, "onloadstart"),
+ enumerable,
+ receiver = web_api_interfaces::FileReader::is_instance
+ )]
+ onloadstart: (),
+ #[webapi(
+ accessor_property = "onprogress",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onprogress"),
+ setter_data = v8str(scope, "onprogress"),
+ enumerable,
+ receiver = web_api_interfaces::FileReader::is_instance
+ )]
+ onprogress: (),
+ #[webapi(
+ accessor_property = "onload",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onload"),
+ setter_data = v8str(scope, "onload"),
+ enumerable,
+ receiver = web_api_interfaces::FileReader::is_instance
+ )]
+ onload: (),
+ #[webapi(
+ accessor_property = "onloadend",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onloadend"),
+ setter_data = v8str(scope, "onloadend"),
+ enumerable,
+ receiver = web_api_interfaces::FileReader::is_instance
+ )]
+ onloadend: (),
+ #[webapi(
+ accessor_property = "onerror",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onerror"),
+ setter_data = v8str(scope, "onerror"),
+ enumerable,
+ receiver = web_api_interfaces::FileReader::is_instance
+ )]
+ onerror: (),
+ #[webapi(
+ accessor_property = "onabort",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onabort"),
+ setter_data = v8str(scope, "onabort"),
+ enumerable,
+ receiver = web_api_interfaces::FileReader::is_instance
+ )]
+ onabort: (),
+
#[webapi(
accessor_property,
getter = file_reader_ready_state_getter_callback,
diff --git a/moli-renderer-v8/src/context_bootstrap/idle_detection.rs b/moli-renderer-v8/src/context_bootstrap/idle_detection.rs
index 23cd6f333..e4ed782ea 100644
--- a/moli-renderer-v8/src/context_bootstrap/idle_detection.rs
+++ b/moli-renderer-v8/src/context_bootstrap/idle_detection.rs
@@ -1,5 +1,6 @@
use super::{
SIMPLE_EVENT_TARGET_SLOT, dispatch_simple_event_target_event, global_constructor_object,
+ simple_event_target_handler_getter_callback, simple_event_target_handler_setter_callback,
};
use crate::web_api_interfaces;
use crate::{
@@ -38,14 +39,22 @@ struct IdleDetectorObjectDeclaration {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = IDLE_DETECTOR_LISTENERS_SLOT)]
event_target_slot: (),
-
- #[webapi(data_property = "onchange", init = "null")]
- onchange: (),
}
#[derive(WebApiFunctionTemplate)]
#[webapi(interface = web_api_interfaces::IdleDetector)]
struct IdleDetectorPrototypeDeclaration {
+ #[webapi(
+ accessor_property = "onchange",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onchange"),
+ setter_data = v8str(scope, "onchange"),
+ enumerable,
+ receiver = web_api_interfaces::IdleDetector::is_instance
+ )]
+ onchange: (),
+
#[webapi(
accessor_property = "userState",
getter = idle_detector_user_state_getter,
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/database.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/database.rs
index 40fd91fda..9badb625f 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/database.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/database.rs
@@ -1,4 +1,8 @@
use super::*;
+use crate::context_bootstrap::{
+ SIMPLE_EVENT_TARGET_SLOT, simple_event_target_handler_getter_callback,
+ simple_event_target_handler_setter_callback,
+};
use crate::web_api_interfaces;
use moli_webapi_declare::WebApiObject;
@@ -11,19 +15,53 @@ use moli_webapi_declare::WebApiObject;
enumerable
)]
struct IdbDatabaseObjectDeclaration<'scope, 'value> {
+ #[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = INDEXED_DB_EVENT_LISTENERS_SLOT)]
+ event_target_slot: (),
#[webapi(slot = INDEXED_DB_EVENT_LISTENERS_SLOT, init = "null_object")]
event_listeners: (),
name: &'value str,
version: f64,
object_store_names: v8::Local<'scope, v8::Object>,
- #[webapi(init = "null")]
+ #[webapi(
+ accessor_property = "onabort",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onabort"),
+ setter_data = v8str(scope, "onabort"),
+ enumerable,
+ receiver = web_api_interfaces::IDBDatabase::is_instance
+ )]
onabort: (),
- #[webapi(init = "null")]
+ #[webapi(
+ accessor_property = "onclose",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onclose"),
+ setter_data = v8str(scope, "onclose"),
+ enumerable,
+ receiver = web_api_interfaces::IDBDatabase::is_instance
+ )]
onclose: (),
- #[webapi(init = "null")]
+ #[webapi(
+ accessor_property = "onerror",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onerror"),
+ setter_data = v8str(scope, "onerror"),
+ enumerable,
+ receiver = web_api_interfaces::IDBDatabase::is_instance
+ )]
onerror: (),
- #[webapi(init = "null")]
+ #[webapi(
+ accessor_property = "onversionchange",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onversionchange"),
+ setter_data = v8str(scope, "onversionchange"),
+ enumerable,
+ receiver = web_api_interfaces::IDBDatabase::is_instance
+ )]
onversionchange: (),
}
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/request.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/request.rs
index 82c121640..480bb78de 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/request.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/request.rs
@@ -1,10 +1,16 @@
use super::*;
+use crate::context_bootstrap::{
+ SIMPLE_EVENT_TARGET_SLOT, simple_event_target_handler_getter_callback,
+ simple_event_target_handler_setter_callback,
+};
use crate::web_api_interfaces;
use moli_webapi_declare::WebApiObject;
#[derive(WebApiObject)]
#[webapi(prototype = "Object", interface = web_api_interfaces::IDBRequest)]
struct IdbRequestObjectDeclaration<'scope> {
+ #[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = INDEXED_DB_EVENT_LISTENERS_SLOT)]
+ event_target_slot: (),
#[webapi(slot = INDEXED_DB_EVENT_LISTENERS_SLOT, init = "null_object")]
event_listeners: (),
@@ -23,20 +29,52 @@ struct IdbRequestObjectDeclaration<'scope> {
#[webapi(data_property, enumerable)]
ready_state: &'static str,
- #[webapi(data_property, enumerable, init = "null")]
+ #[webapi(
+ accessor_property = "onsuccess",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onsuccess"),
+ setter_data = v8str(scope, "onsuccess"),
+ enumerable,
+ receiver = web_api_interfaces::IDBRequest::is_instance
+ )]
onsuccess: (),
- #[webapi(data_property, enumerable, init = "null")]
+ #[webapi(
+ accessor_property = "onerror",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onerror"),
+ setter_data = v8str(scope, "onerror"),
+ enumerable,
+ receiver = web_api_interfaces::IDBRequest::is_instance
+ )]
onerror: (),
}
#[derive(Default, WebApiObject)]
#[webapi(prototype = "Object", interface = web_api_interfaces::IDBOpenDBRequest)]
struct IdbOpenRequestHandlersDeclaration {
- #[webapi(data_property, enumerable, init = "null")]
+ #[webapi(
+ accessor_property = "onupgradeneeded",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onupgradeneeded"),
+ setter_data = v8str(scope, "onupgradeneeded"),
+ enumerable,
+ receiver = web_api_interfaces::IDBOpenDBRequest::is_instance
+ )]
onupgradeneeded: (),
- #[webapi(data_property, enumerable, init = "null")]
+ #[webapi(
+ accessor_property = "onblocked",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onblocked"),
+ setter_data = v8str(scope, "onblocked"),
+ enumerable,
+ receiver = web_api_interfaces::IDBOpenDBRequest::is_instance
+ )]
onblocked: (),
}
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/transaction.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/transaction.rs
index b3d756707..5e2d3c7db 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/transaction.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/core/objects/creation/transaction.rs
@@ -1,4 +1,8 @@
use super::*;
+use crate::context_bootstrap::{
+ SIMPLE_EVENT_TARGET_SLOT, simple_event_target_handler_getter_callback,
+ simple_event_target_handler_setter_callback,
+};
use crate::web_api_interfaces;
use moli_webapi_declare::WebApiObject;
@@ -10,6 +14,8 @@ use moli_webapi_declare::WebApiObject;
enumerable
)]
struct IdbTransactionObjectDeclaration<'scope> {
+ #[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = INDEXED_DB_EVENT_LISTENERS_SLOT)]
+ event_target_slot: (),
#[webapi(slot = INDEXED_DB_EVENT_LISTENERS_SLOT, init = "null_object")]
event_listeners: (),
@@ -18,11 +24,35 @@ struct IdbTransactionObjectDeclaration<'scope> {
#[webapi(init = "null")]
error: (),
object_store_names: v8::Local<'scope, v8::Object>,
- #[webapi(init = "null")]
+ #[webapi(
+ accessor_property = "onabort",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onabort"),
+ setter_data = v8str(scope, "onabort"),
+ enumerable,
+ receiver = web_api_interfaces::IDBTransaction::is_instance
+ )]
onabort: (),
- #[webapi(init = "null")]
+ #[webapi(
+ accessor_property = "oncomplete",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "oncomplete"),
+ setter_data = v8str(scope, "oncomplete"),
+ enumerable,
+ receiver = web_api_interfaces::IDBTransaction::is_instance
+ )]
oncomplete: (),
- #[webapi(init = "null")]
+ #[webapi(
+ accessor_property = "onerror",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onerror"),
+ setter_data = v8str(scope, "onerror"),
+ enumerable,
+ receiver = web_api_interfaces::IDBTransaction::is_instance
+ )]
onerror: (),
}
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target.rs
index ed80dd2b8..ed186083c 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target.rs
@@ -1,11 +1,9 @@
use super::*;
mod dispatch;
-mod listeners;
mod target;
mod version_change;
pub(super) use self::dispatch::*;
-pub(super) use self::listeners::*;
pub(super) use self::target::*;
pub(in crate::context_bootstrap) use self::version_change::*;
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/dispatch.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/dispatch.rs
index f60b5288a..862e1c349 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/dispatch.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/dispatch.rs
@@ -1,6 +1,5 @@
use super::*;
-use crate::context_bootstrap::events::{clear_event_dispatch_fields, set_event_dispatch_fields};
-use crate::exception_reporting::invoke_event_handler;
+use crate::context_bootstrap::dispatch_simple_event_target_event;
pub(in crate::context_bootstrap::indexed_db) fn dispatch_idb_named_event<'s>(
scope: &mut v8::PinScope<'s, '_>,
@@ -30,45 +29,24 @@ pub(in crate::context_bootstrap::indexed_db) fn dispatch_idb_event_object<'s>(
target: v8::Local<'s, v8::Object>,
event: v8::Local<'s, v8::Object>,
) -> bool {
- let Some(event_type) = object_string_property_defined(scope, event, "type") else {
+ let Some(event_type) = crate::context_bootstrap::event_attribute(scope, event, "type")
+ .and_then(|value| value.to_string(scope))
+ .map(|value| value.to_rust_string_lossy(scope))
+ else {
return true;
};
- let listeners = event_listener_snapshot(scope, target, &event_type);
- set_event_dispatch_fields(scope, target, event);
let owner_scope = idb_event_target_owner_scope(scope, target);
let previous_owner = owner_scope.enter(scope);
+ let uncanceled = dispatch_simple_event_target_event(
+ scope,
+ target,
+ INDEXED_DB_EVENT_LISTENERS_SLOT,
+ &event_type,
+ event,
+ );
- let handler_name = format!("on{event_type}");
- if let Some(handler_key) = v8_string(scope, &handler_name)
- && let Some(handler_value) = target.get(scope, handler_key.into())
- && let Ok(handler) = v8::Local::<v8::Function>::try_from(handler_value)
- {
- // IndexedDB requests/transactions are still EventTarget dispatch. Page exceptions should
- // be reported, but they must not abort delivery to later listeners or flip the operation
- // into a host/runtime failure.
- let _ = invoke_event_handler(
- scope,
- &handler_name,
- handler,
- target.into(),
- &[event.into()],
- );
- }
-
- for listener in listeners {
- let listener_name = format!("{event_type} listener");
- let _ = invoke_event_handler(
- scope,
- &listener_name,
- listener,
- target.into(),
- &[event.into()],
- );
- }
-
- clear_event_dispatch_fields(scope, event);
owner_scope.defer_restore(scope, previous_owner);
- !crate::context_bootstrap::event_bool_attribute(scope, event, "defaultPrevented")
+ uncanceled
}
fn idb_event_target_owner_scope<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/listeners.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/listeners.rs
deleted file mode 100644
index 80c50f2e9..000000000
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/listeners.rs
+++ /dev/null
@@ -1,58 +0,0 @@
-use super::*;
-
-pub(in crate::context_bootstrap::indexed_db) fn event_listener_array<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
- event_type: &str,
- create: bool,
-) -> Option<v8::Local<'s, v8::Array>> {
- let registry = if let Some(existing) =
- object_property_as_object(scope, target, INDEXED_DB_EVENT_LISTENERS_SLOT)
- {
- existing
- } else if create {
- // Event type is a page-controlled dictionary key; keep the registry
- // null-prototype and read it own-only below.
- let registry = new_null_prototype_object(scope);
- set_indexed_db_slot_value(
- scope,
- target,
- INDEXED_DB_EVENT_LISTENERS_SLOT,
- registry.into(),
- );
- registry
- } else {
- return None;
- };
-
- if let Some(existing) = object_own_property_as_array(scope, registry, event_type) {
- return Some(existing);
- }
- if !create {
- return None;
- }
- let listeners = v8::Array::new(scope, 0);
- set_indexed_db_internal_object_property(scope, registry, event_type, listeners.into());
- Some(listeners)
-}
-
-pub(in crate::context_bootstrap::indexed_db) fn event_listener_snapshot<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
- event_type: &str,
-) -> Vec<v8::Local<'s, v8::Function>> {
- let Some(listeners) = event_listener_array(scope, target, event_type, false) else {
- return Vec::new();
- };
- let mut snapshot = Vec::with_capacity(listeners.length() as usize);
- for index in 0..listeners.length() {
- let Some(value) = listeners.get_index(scope, index) else {
- continue;
- };
- let Ok(listener) = v8::Local::<v8::Function>::try_from(value) else {
- continue;
- };
- snapshot.push(listener);
- }
- snapshot
-}
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/target.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/target.rs
index bd56a8237..90ad87189 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/target.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/event_target/target.rs
@@ -1,53 +1,17 @@
use super::*;
-use crate::webidl;
-
-#[derive(webidl::WebIdlArgs)]
-#[webidl(prefix = "IDBEventTarget.addEventListener")]
-struct IdbEventTargetAddEventListenerArgs<'s> {
- #[webidl(required, name = "type")]
- event_type: String,
- #[webidl(index = 1, converter = "raw")]
- listener: Option<v8::Local<'s, v8::Value>>,
-}
-
-#[derive(webidl::WebIdlArgs)]
-#[webidl(prefix = "IDBEventTarget.removeEventListener")]
-struct IdbEventTargetRemoveEventListenerArgs<'s> {
- #[webidl(required, name = "type")]
- event_type: String,
- #[webidl(index = 1, converter = "raw")]
- listener: Option<v8::Local<'s, v8::Value>>,
-}
-
-#[derive(webidl::WebIdlArgs)]
-#[webidl(prefix = "IDBEventTarget.dispatchEvent")]
-struct IdbEventTargetDispatchEventArgs<'s> {
- #[webidl(required, converter = "raw")]
- event: v8::Local<'s, v8::Value>,
-}
+use crate::context_bootstrap::{
+ simple_object_event_target_add_listener, simple_object_event_target_remove_listener,
+};
pub(in crate::context_bootstrap::indexed_db) fn idb_event_target_add_event_listener_callback<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- let Some(parsed) = webidl::parse_args::<IdbEventTargetAddEventListenerArgs<'s>>(scope, &args)
- else {
- return;
- };
- let Some(listener) = parsed.listener else {
- return;
- };
- let Ok(listener) = v8::Local::<v8::Function>::try_from(listener) else {
+ if !require_idb_event_target(scope, args.this()) {
return;
- };
- let target = args.this();
- let Some(listeners) = event_listener_array(scope, target, &parsed.event_type, true) else {
- return;
- };
- if !array_contains_strict(scope, listeners, listener.into()) {
- let _ = listeners.set_index(scope, listeners.length(), listener.into());
}
+ simple_object_event_target_add_listener(scope, &args, INDEXED_DB_EVENT_LISTENERS_SLOT);
}
pub(in crate::context_bootstrap::indexed_db) fn idb_event_target_remove_event_listener_callback<
@@ -57,36 +21,10 @@ pub(in crate::context_bootstrap::indexed_db) fn idb_event_target_remove_event_li
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- let Some(parsed) =
- webidl::parse_args::<IdbEventTargetRemoveEventListenerArgs<'s>>(scope, &args)
- else {
+ if !require_idb_event_target(scope, args.this()) {
return;
- };
- let Some(listener) = parsed.listener else {
- return;
- };
- let Ok(listener) = v8::Local::<v8::Function>::try_from(listener) else {
- return;
- };
- let target = args.this();
- let Some(current) = event_listener_array(scope, target, &parsed.event_type, false) else {
- return;
- };
- let next = v8::Array::new(scope, 0);
- for index in 0..current.length() {
- let Some(candidate) = current.get_index(scope, index) else {
- continue;
- };
- if candidate.strict_equals(listener.into()) {
- continue;
- }
- let _ = next.set_index(scope, next.length(), candidate);
- }
- if let Some(registry) =
- object_property_as_object(scope, target, INDEXED_DB_EVENT_LISTENERS_SLOT)
- {
- set_indexed_db_internal_object_property(scope, registry, &parsed.event_type, next.into());
}
+ simple_object_event_target_remove_listener(scope, &args, INDEXED_DB_EVENT_LISTENERS_SLOT);
}
pub(in crate::context_bootstrap::indexed_db) fn idb_event_target_dispatch_event_callback<'s>(
@@ -94,30 +32,25 @@ pub(in crate::context_bootstrap::indexed_db) fn idb_event_target_dispatch_event_
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'s, v8::Value>,
) {
- let Some(parsed) = webidl::parse_args::<IdbEventTargetDispatchEventArgs<'s>>(scope, &args)
- else {
- return;
- };
- let value = parsed.event;
- if !value.is_object() || value.is_function() {
- throw_type_error(
- scope,
- "Failed to execute 'dispatchEvent': parameter 1 is not an object.",
- );
+ if !require_idb_event_target(scope, args.this()) {
return;
}
- let Ok(event) = v8::Local::<v8::Object>::try_from(value) else {
- throw_type_error(
- scope,
- "Failed to execute 'dispatchEvent': parameter 1 is not an object.",
- );
+ let Some((event, _)) = crate::context_bootstrap::event_target_dispatch::prepare_script_dispatch(
+ scope,
+ args.get(0),
+ ) else {
return;
};
- let target = args.this();
- if indexed_db_typed_owner_scope(scope, target).is_none() {
- throw_type_error(scope, "Illegal invocation");
- return;
+ rv.set_bool(dispatch_idb_event_object(scope, args.this(), event));
+}
+
+fn require_idb_event_target<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ target: v8::Local<'s, v8::Object>,
+) -> bool {
+ if indexed_db_typed_owner_scope(scope, target).is_some() {
+ return true;
}
- let dispatched = dispatch_idb_event_object(scope, target, event);
- rv.set(v8::Boolean::new(scope, dispatched).into());
+ throw_type_error(scope, "Illegal invocation");
+ false
}
diff --git a/moli-renderer-v8/src/context_bootstrap/indexed_db/mod.rs b/moli-renderer-v8/src/context_bootstrap/indexed_db/mod.rs
index 516df89f7..0c1c6b5b2 100644
--- a/moli-renderer-v8/src/context_bootstrap/indexed_db/mod.rs
+++ b/moli-renderer-v8/src/context_bootstrap/indexed_db/mod.rs
@@ -4,8 +4,7 @@ use super::{
global_constructor_prototype, object_bool_property as public_object_bool_property,
object_number_property as public_object_number_property,
object_property_as_object as public_object_property_as_object,
- object_string_property as public_object_string_property, object_string_property_defined,
- throw_type_error, v8_string, v8str,
+ object_string_property as public_object_string_property, throw_type_error, v8_string, v8str,
};
use crate::util::{new_null_prototype_object, private_key, set_private_value};
@@ -160,27 +159,6 @@ fn set_indexed_db_internal_object_property(
let _ = object.define_own_property(scope, key.into(), value, v8::PropertyAttribute::NONE);
}
-fn object_own_value<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- object: v8::Local<'_, v8::Object>,
- key: &str,
-) -> Option<v8::Local<'s, v8::Value>> {
- let key = v8_string(scope, key)?;
- if !object.has_own_property(scope, key.into()).unwrap_or(false) {
- return None;
- }
- object.get(scope, key.into())
-}
-
-fn object_own_property_as_array<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- object: v8::Local<'_, v8::Object>,
- key: &str,
-) -> Option<v8::Local<'s, v8::Array>> {
- object_own_value(scope, object, key)
- .and_then(|value| v8::Local::<v8::Array>::try_from(value).ok())
-}
-
fn indexed_db_private_value<'s>(
scope: &mut v8::PinScope<'s, '_>,
object: v8::Local<'_, v8::Object>,
diff --git a/moli-renderer-v8/src/context_bootstrap/media_cues.rs b/moli-renderer-v8/src/context_bootstrap/media_cues.rs
index 1ba9b449b..ef6321ebf 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_cues.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_cues.rs
@@ -1,6 +1,6 @@
use super::super::util::{throw_type_error, v8_string};
use super::context_host_ptr_from_global_bridge;
-use super::mark_simple_event_target_slot;
+use super::{mark_simple_event_target_slot, simple_object_event_set_handler};
use crate::document_runtime::DomHandle;
use crate::native_bridge::JsContextHost;
use crate::native_bridge::throw_dom_exception;
@@ -22,6 +22,7 @@ const TEXT_TRACK_CUE_SIZE_SLOT: &str = "__moliTextTrackCueSize";
const TEXT_TRACK_CUE_ALIGN_SLOT: &str = "__moliTextTrackCueAlign";
const TEXT_TRACK_CUE_ONENTER_SLOT: &str = "__moliTextTrackCueOnEnter";
const TEXT_TRACK_CUE_ONEXIT_SLOT: &str = "__moliTextTrackCueOnExit";
+const TEXT_TRACK_CUE_LISTENERS_SLOT: &str = "__moliTextTrackCueListeners";
const TEXT_TRACK_CUE_TEXT_SLOT: &str = "__moliTextTrackCueText";
const MEDIA_ERROR_CODE_SLOT: &str = "__moliMediaErrorCode";
const MEDIA_ERROR_MESSAGE_SLOT: &str = "__moliMediaErrorMessage";
@@ -303,7 +304,7 @@ pub(super) fn vtt_cue_constructor_callback<'s>(
return;
};
- mark_simple_event_target_slot(scope, args.this(), "__moliTextTrackCueListeners");
+ mark_simple_event_target_slot(scope, args.this(), TEXT_TRACK_CUE_LISTENERS_SLOT);
VttCuePrivateStateDeclaration::new(parsed.start_time, parsed.end_time, parsed.text)
.initialize(scope, args.this())
.expect("VTTCue private state declaration should initialize");
@@ -1020,7 +1021,7 @@ fn text_track_cue_onenter_setter<'s>(
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- event_handler_setter(scope, args, TEXT_TRACK_CUE_ONENTER_SLOT);
+ event_handler_setter(scope, args, "enter", TEXT_TRACK_CUE_ONENTER_SLOT);
}
fn text_track_cue_onexit_getter<'s>(
@@ -1036,7 +1037,7 @@ fn text_track_cue_onexit_setter<'s>(
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- event_handler_setter(scope, args, TEXT_TRACK_CUE_ONEXIT_SLOT);
+ event_handler_setter(scope, args, "exit", TEXT_TRACK_CUE_ONEXIT_SLOT);
}
fn event_handler_getter<'s>(
@@ -1054,17 +1055,20 @@ fn event_handler_getter<'s>(
fn event_handler_setter<'s>(
scope: &mut v8::PinScope<'s, '_>,
args: v8::FunctionCallbackArguments<'s>,
+ event_type: &str,
slot: &'static str,
) {
let Some(receiver) = text_track_cue_receiver(scope, &args) else {
return;
};
- let value = args.get(0);
- if value.is_function() {
- set_private_value(scope, receiver, slot, value);
- } else {
- set_private_value(scope, receiver, slot, v8::null(scope).into());
- }
+ simple_object_event_set_handler(
+ scope,
+ receiver,
+ TEXT_TRACK_CUE_LISTENERS_SLOT,
+ event_type,
+ slot,
+ args.get(0),
+ );
}
fn finite_double_property<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries.rs b/moli-renderer-v8/src/context_bootstrap/media_queries.rs
index 52507ef3f..b20da491f 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries.rs
@@ -12,12 +12,13 @@ pub(in crate::context_bootstrap) use self::events::dispatch_media_query_list_eve
pub(crate) use self::events::{
SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,
dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,
- install_simple_event_target_methods, install_simple_event_target_ordered_handlers,
+ install_simple_event_target_handlers, install_simple_event_target_methods,
invoke_simple_event_listener, mark_simple_event_target_slot,
simple_event_target_add_event_listener_callback, simple_event_target_dispatch_event_callback,
+ simple_event_target_handler_getter_callback, simple_event_target_handler_setter_callback,
simple_event_target_inspector_listener_snapshots,
simple_event_target_remove_event_listener_callback, simple_event_target_slot_name,
- simple_object_event_listeners_snapshot, simple_object_event_set_ordered_handler,
+ simple_object_event_listeners_snapshot, simple_object_event_set_handler,
simple_object_event_target_add_listener, simple_object_event_target_remove_listener,
simple_object_has_event_listeners,
};
@@ -26,7 +27,6 @@ pub(super) use self::events::{
};
use super::{
- MEDIA_QUERY_LIST_LISTENERS_SLOT, SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT,
- SIMPLE_EVENT_TARGET_SLOT, object_property_as_array, object_string_property_defined, v8_string,
- v8str,
+ MEDIA_QUERY_LIST_LISTENERS_SLOT, SIMPLE_EVENT_TARGET_SLOT, object_property_as_array,
+ object_string_property_defined, v8str,
};
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/evaluation.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/evaluation.rs
index 8a665d3d6..53f496ef0 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/evaluation.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/evaluation.rs
@@ -1,7 +1,6 @@
use super::event::create_media_query_list_event;
use super::{
- dispatch_media_query_list_event, install_simple_event_target_ordered_handlers,
- mark_simple_event_target_slot, simple_object_event_set_ordered_handler,
+ dispatch_media_query_list_event, mark_simple_event_target_slot, simple_object_event_set_handler,
};
use crate::context_bootstrap::DEFAULT_WINDOW_SURFACE_PROFILE;
use crate::context_bootstrap::current_window_style_viewport;
@@ -136,21 +135,14 @@ fn media_query_list_onchange_setter_callback<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- let active = args.get(0).is_object();
- let value = if active {
- args.get(0)
- } else {
- v8::null(scope).into()
- };
let target = args.this();
- set_media_query_list_slot_value(scope, target, MEDIA_QUERY_LIST_ONCHANGE_SLOT, value);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
target,
MEDIA_QUERY_LIST_LISTENERS_SLOT,
"change",
MEDIA_QUERY_LIST_ONCHANGE_SLOT,
- active,
+ args.get(0),
);
rv.set_undefined();
}
@@ -183,7 +175,7 @@ pub(crate) fn window_match_media_callback<'s>(
.bind(scope)
.expect("MediaQueryList declaration should bind");
mark_simple_event_target_slot(scope, mql, MEDIA_QUERY_LIST_LISTENERS_SLOT);
- install_simple_event_target_ordered_handlers(scope, mql);
+
if global_queue_array(scope, MEDIA_QUERY_LIST_REGISTRY_SLOT).is_none() {
let global = scope.get_current_context().global(scope);
let registry = v8::Array::new(scope, 0);
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs
index 703bbd4fa..bb7043bee 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events.rs
@@ -1,7 +1,6 @@
use super::{
- MEDIA_QUERY_LIST_LISTENERS_SLOT, SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT,
- SIMPLE_EVENT_TARGET_SLOT, object_property_as_array, object_string_property_defined, v8_string,
- v8str,
+ MEDIA_QUERY_LIST_LISTENERS_SLOT, SIMPLE_EVENT_TARGET_SLOT, object_property_as_array,
+ object_string_property_defined, v8str,
};
const SIMPLE_EVENT_TARGET_HANDLER_SLOT_FIELD: &str = "handlerSlot";
@@ -15,13 +14,14 @@ pub(in crate::context_bootstrap) use media_query_list::{
pub(crate) use simple_event_target::{
SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,
dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,
- install_simple_event_target_methods, install_simple_event_target_ordered_handlers,
+ install_simple_event_target_handlers, install_simple_event_target_methods,
invoke_simple_event_listener, mark_simple_event_target_slot,
simple_event_target_add_event_listener_callback, simple_event_target_dispatch_event_callback,
+ simple_event_target_handler_getter_callback, simple_event_target_handler_setter_callback,
simple_event_target_inspector_listener_snapshots,
simple_event_target_remove_event_listener_callback, simple_event_target_slot_name,
simple_object_event_listeners_snapshot, simple_object_event_remove_listener_value_for_type,
- simple_object_event_set_ordered_handler, simple_object_event_target_add_listener,
+ simple_object_event_set_handler, simple_object_event_target_add_listener,
simple_object_event_target_register_webidl_listener,
simple_object_event_target_remove_listener, simple_object_has_event_listeners,
};
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 9878bbf59..7c02b4b28 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
@@ -2,6 +2,7 @@ use super::*;
mod callbacks;
mod dispatch;
+mod handlers;
mod install;
mod listeners;
mod state;
@@ -15,20 +16,19 @@ pub(crate) use dispatch::{
dispatch_simple_event_target_event, dispatch_simple_event_target_event_collecting_errors,
invoke_simple_event_listener,
};
-pub(crate) use install::{
- install_simple_event_target_methods, install_simple_event_target_ordered_handlers,
- mark_simple_event_target_slot,
+pub(crate) use handlers::{
+ install_simple_event_target_handlers, simple_event_target_handler_getter_callback,
+ simple_event_target_handler_setter_callback,
};
-pub(in crate::context_bootstrap::media_queries::events::simple_event_target) use listeners::simple_event_target_uses_ordered_handlers;
+pub(crate) use install::{install_simple_event_target_methods, mark_simple_event_target_slot};
pub(crate) use listeners::{
SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,
simple_event_target_inspector_listener_snapshots, simple_object_event_listeners_snapshot,
- simple_object_event_remove_listener_value_for_type, simple_object_event_set_ordered_handler,
+ simple_object_event_remove_listener_value_for_type, simple_object_event_set_handler,
simple_object_has_event_listeners,
};
pub(crate) use listeners::{
simple_object_event_target_add_listener, simple_object_event_target_register_webidl_listener,
simple_object_event_target_remove_listener,
};
-pub(in crate::context_bootstrap::media_queries::events::simple_event_target) use state::simple_event_target_private_value;
pub(crate) use state::simple_event_target_slot_name;
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 5d75f98a3..ef3107cf9 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
@@ -79,52 +79,7 @@ pub(crate) fn dispatch_simple_event_target_event_collecting_errors<'s>(
} else {
None
};
- let ordinary_arguments = [event.into()];
- let handler_arguments = error_arguments
- .as_ref()
- .map_or(ordinary_arguments.as_slice(), |values| values.as_slice());
- if can_invoke && !simple_event_target_uses_ordered_handlers(scope, target) {
- let handler_name = format!("on{event_type}");
- if let Some(handler_key) = v8_string(scope, &handler_name)
- && let Some(handler_value) = target.get(scope, handler_key.into())
- && let Ok(handler) = v8::Local::<v8::Object>::try_from(handler_value)
- && handler.is_callable()
- {
- let current_context = scope.get_current_context();
- let relevant_context = handler
- .get_creation_context(scope)
- .unwrap_or(current_context);
- let incumbent_context = scope.get_incumbent_context().unwrap_or(current_context);
- let outcome = invoke_simple_event_callback(
- scope,
- event_type,
- &format!("simple event target {handler_name}"),
- handler,
- relevant_context,
- incumbent_context,
- true,
- target.into(),
- handler_arguments,
- event,
- callback_errors.as_deref_mut(),
- );
- dispatched |= outcome.invoked;
- if let Some(returned) = outcome.value {
- apply_handler_return_value(
- scope,
- event,
- v8::Local::new(scope, &returned),
- error_arguments.is_some(),
- );
- }
- }
- }
-
- if !event_internal_bool_flag(
- scope,
- event,
- crate::context_bootstrap::EVENT_STOP_PROPAGATION_SLOT,
- ) {
+ if can_invoke {
'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.
@@ -258,41 +213,6 @@ fn invoke_simple_event_listener_collecting_errors<'s>(
)
}
-#[allow(clippy::too_many_arguments)]
-fn invoke_simple_event_callback<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- event_type: &str,
- callback_name: &str,
- callback: v8::Local<'s, v8::Object>,
- relevant_context: v8::Local<'s, v8::Context>,
- incumbent_context: v8::Local<'s, v8::Context>,
- is_callable: bool,
- callback_this: v8::Local<'s, v8::Value>,
- arguments: &[v8::Local<'s, v8::Value>],
- current_event: v8::Local<'s, v8::Object>,
- callback_errors: Option<&mut Vec<crate::exception_reporting::V8ExceptionReport>>,
-) -> SimpleEventCallbackResult {
- let invocation = CallbackInvocation::new(
- callback,
- callback_this,
- relevant_context,
- incumbent_context,
- is_callable,
- "handleEvent",
- arguments,
- Some(current_event),
- );
- invoke_simple_event_callback_with_invocation(
- scope,
- event_type,
- callback_name,
- callback_this,
- relevant_context,
- invocation,
- callback_errors,
- )
-}
-
fn simple_event_target_interface_name<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Value>,
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
new file mode 100644
index 000000000..5c2d8c7cf
--- /dev/null
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/handlers.rs
@@ -0,0 +1,72 @@
+use super::*;
+use crate::definitions::define_function_accessor_property;
+use crate::util::{get_private_value, throw_type_error, v8str};
+
+// These callbacks are shared by declared EventHandler accessors. Their callback
+// data is the property name, which also identifies the private handler slot.
+pub(crate) fn simple_event_target_handler_getter_callback<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: v8::FunctionCallbackArguments<'s>,
+ mut rv: v8::ReturnValue<'_, v8::Value>,
+) {
+ let Some((property, _)) = handler_callback_data(scope, &args) else {
+ return;
+ };
+ rv.set(
+ get_private_value(scope, args.this(), &property).unwrap_or_else(|| v8::null(scope).into()),
+ );
+}
+
+pub(crate) fn simple_event_target_handler_setter_callback<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: v8::FunctionCallbackArguments<'s>,
+ _rv: v8::ReturnValue<'_, v8::Value>,
+) {
+ let Some((property, slot)) = handler_callback_data(scope, &args) else {
+ return;
+ };
+ simple_object_event_set_handler(
+ scope,
+ args.this(),
+ &slot,
+ property.strip_prefix("on").expect("event handler property"),
+ &property,
+ args.get(0),
+ );
+}
+
+fn handler_callback_data<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: &v8::FunctionCallbackArguments<'s>,
+) -> Option<(String, String)> {
+ let Some(slot) = simple_event_target_slot_name(scope, args.this()) else {
+ throw_type_error(scope, "Illegal invocation");
+ return None;
+ };
+ v8::Local::<v8::String>::try_from(args.data())
+ .ok()
+ .map(|property| (property.to_rust_string_lossy(scope), slot))
+}
+
+/// Install explicit EventHandler accessors on object-backed Window surfaces.
+/// Ordinary properties with an `on` prefix never become listeners implicitly.
+pub(crate) fn install_simple_event_target_handlers<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ target: v8::Local<'s, v8::Object>,
+ properties: &[&'static str],
+) {
+ for property in properties {
+ let data = v8str(scope, property).into();
+ define_function_accessor_property(
+ scope,
+ target,
+ property,
+ simple_event_target_handler_getter_callback,
+ Some(data),
+ simple_event_target_handler_setter_callback,
+ Some(data),
+ v8::PropertyAttribute::NONE,
+ )
+ .expect("simple event handler accessor should initialize");
+ }
+}
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/install.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/install.rs
index 96114ddcc..6a90306f9 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/install.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/simple_event_target/install.rs
@@ -10,7 +10,7 @@ use moli_webapi_declare::WebApiObject;
enumerable,
receiver
)]
-struct SimpleEventTargetMethodsDeclaration<'scope> {
+struct SimpleEventTargetMethodsDeclaration {
#[webapi(method, length = 2, callback = simple_event_target_add_event_listener_callback)]
add_event_listener: (),
#[webapi(
@@ -21,18 +21,17 @@ struct SimpleEventTargetMethodsDeclaration<'scope> {
remove_event_listener: (),
#[webapi(method, length = 1, callback = simple_event_target_dispatch_event_callback)]
dispatch_event: (),
- #[webapi(data_property = "onchange")]
- onchange: Option<v8::Local<'scope, v8::Value>>,
}
pub(crate) fn install_simple_event_target_methods<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Object>,
slot_name: &'static str,
- with_onchange: bool,
) {
mark_simple_event_target_slot(scope, target, slot_name);
- install_simple_event_target_methods_without_slot(scope, target, with_onchange);
+ SimpleEventTargetMethodsDeclaration::new()
+ .initialize(scope, target)
+ .expect("simple event target declaration should initialize");
}
pub(crate) fn mark_simple_event_target_slot<'s>(
@@ -47,25 +46,3 @@ pub(crate) fn mark_simple_event_target_slot<'s>(
v8str(scope, slot_name).into(),
);
}
-
-fn install_simple_event_target_methods_without_slot<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
- with_onchange: bool,
-) {
- SimpleEventTargetMethodsDeclaration::new(with_onchange.then(|| v8::null(scope).into()))
- .initialize(scope, target)
- .expect("simple event target declaration should initialize");
-}
-
-pub(crate) fn install_simple_event_target_ordered_handlers<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
-) {
- set_private_value(
- scope,
- target,
- SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT,
- v8::Boolean::new(scope, true).into(),
- );
-}
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 b9ae77600..0699d9821 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
@@ -72,7 +72,7 @@ struct SimpleObjectEventHandlerEntryDeclaration<'scope> {
#[webapi(slot = SIMPLE_EVENT_TARGET_LISTENER_ORIGINAL_SLOT)]
original: Option<v8::Local<'scope, v8::String>>,
#[webapi(slot = SIMPLE_EVENT_TARGET_HANDLER_SLOT_FIELD)]
- handler_slot: &'static str,
+ handler_slot: v8::Local<'scope, v8::String>,
#[webapi(slot = SIMPLE_EVENT_TARGET_LISTENER_CALLBACK_SLOT)]
callback: v8::Local<'scope, v8::Object>,
#[webapi(slot = SIMPLE_EVENT_TARGET_LISTENER_RELEVANT_CONTEXT_ANCHOR_SLOT)]
@@ -573,29 +573,32 @@ pub(crate) fn simple_event_target_inspector_listener_snapshots<'s>(
snapshots
}
-pub(crate) fn simple_object_event_set_ordered_handler<'s>(
+/// Store the HTML EventHandler value and activate, update, or remove its listener.
+/// Replacing a non-null value keeps the entry in its original registration position.
+pub(crate) fn simple_object_event_set_handler<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Object>,
slot_name: &str,
event_type: &str,
- handler_slot_name: &'static str,
- active: bool,
+ handler_slot_name: &str,
+ value: v8::Local<'s, v8::Value>,
) {
+ // EventHandler uses [LegacyTreatNonObjectAsNull]. Non-callable objects still
+ // activate the handler, but must never be treated as handleEvent listeners.
+ let callback = v8::Local::<v8::Object>::try_from(value).ok();
+ let active = callback.is_some();
+ set_private_value(
+ scope,
+ target,
+ handler_slot_name,
+ callback.map_or_else(|| v8::null(scope).into(), |callback| callback.into()),
+ );
let Some(listeners) =
simple_object_event_listener_array(scope, target, slot_name, event_type, active)
else {
return;
};
- if active {
- let Some(callback) = get_private_value(scope, target, handler_slot_name)
- .or_else(|| {
- let key = v8_string(scope, handler_slot_name)?;
- target.get(scope, key.into())
- })
- .and_then(|value| v8::Local::<v8::Object>::try_from(value).ok())
- else {
- return;
- };
+ if let Some(callback) = callback {
let (relevant_context_anchor, incumbent_context_anchor) =
simple_callback_context_anchors(scope, callback);
for index in 0..listeners.length() {
@@ -684,16 +687,6 @@ fn handler_belongs_to_target<'s>(
.is_some_and(|owner| owner.strict_equals(target.into()))
}
-pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn simple_event_target_uses_ordered_handlers<
- 's,
->(
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
-) -> bool {
- simple_event_target_private_value(scope, target, SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT)
- .is_some_and(|value| value.is_true())
-}
-
pub(crate) fn simple_object_event_remove_listener_value_for_type<'s>(
scope: &mut v8::PinScope<'s, '_>,
target: v8::Local<'s, v8::Object>,
@@ -924,7 +917,7 @@ fn simple_object_event_listener_entry_object<'s>(
fn simple_object_event_handler_entry_object<'s>(
scope: &mut v8::PinScope<'s, '_>,
- handler_slot_name: &'static str,
+ handler_slot_name: &str,
callback: v8::Local<'s, v8::Object>,
relevant_context_anchor: v8::Local<'s, v8::Object>,
incumbent_context_anchor: v8::Local<'s, v8::Object>,
@@ -932,7 +925,7 @@ fn simple_object_event_handler_entry_object<'s>(
let marker = format!("event-handler:{handler_slot_name}");
SimpleObjectEventHandlerEntryDeclaration::new(
v8_string(scope, &marker),
- handler_slot_name,
+ v8_string(scope, handler_slot_name).expect("event handler slot"),
callback,
relevant_context_anchor,
incumbent_context_anchor,
diff --git a/moli-renderer-v8/src/context_bootstrap/message_ports/state.rs b/moli-renderer-v8/src/context_bootstrap/message_ports/state.rs
index 6d9cac6f2..6fabcd999 100644
--- a/moli-renderer-v8/src/context_bootstrap/message_ports/state.rs
+++ b/moli-renderer-v8/src/context_bootstrap/message_ports/state.rs
@@ -263,7 +263,7 @@ fn new_message_port_wrapper<'s>(
// Event listeners belong to the JS EventTarget, independently of the
// transferable communication endpoint and its queue attachment.
mark_simple_event_target_slot(scope, port, MESSAGE_PORT_EVENT_LISTENERS_SLOT);
- install_simple_event_target_ordered_handlers(scope, port);
+
Some(port)
}
@@ -520,20 +520,13 @@ fn set_message_port_event_handler<'s>(
handler_slot: &'static str,
event_type: &str,
) {
- let active = value.is_object();
- let handler = if active {
- value
- } else {
- v8::null(scope).into()
- };
- set_message_port_slot_value(scope, port, handler_slot, handler);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
port,
MESSAGE_PORT_EVENT_LISTENERS_SLOT,
event_type,
handler_slot,
- active,
+ value,
);
// Setting onmessage enables the queue permanently, including assigning
// null or a non-callable value. Listener registration alone does not.
diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_entry.rs b/moli-renderer-v8/src/context_bootstrap/navigation_entry.rs
index ff6ab51b8..0586ee354 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigation_entry.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigation_entry.rs
@@ -57,9 +57,6 @@ struct NavigationHistoryEntryObjectDeclaration {
#[webapi(method, callback = navigation_entry_get_state_callback)]
get_state: (),
-
- #[webapi(data_property = "ondispose", init = "null")]
- ondispose: (),
}
fn finite_window_number_slot<'s>(
diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_entry/wrappers.rs b/moli-renderer-v8/src/context_bootstrap/navigation_entry/wrappers.rs
index c1937ce39..4d57d1a27 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigation_entry/wrappers.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigation_entry/wrappers.rs
@@ -124,7 +124,6 @@ fn allocate_in_current_realm<'s>(
scope,
wrapper,
NAVIGATION_ENTRY_EVENT_LISTENERS_SLOT,
- false,
);
shared_event_targets::install_handlers(scope, wrapper, true);
set_runtime_window_owner(scope, wrapper, owner);
diff --git a/moli-renderer-v8/src/context_bootstrap/navigation_surface/runtime.rs b/moli-renderer-v8/src/context_bootstrap/navigation_surface/runtime.rs
index 54d6257a9..329509731 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigation_surface/runtime.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigation_surface/runtime.rs
@@ -24,18 +24,6 @@ struct HistoryRuntimeObjectDeclaration {}
struct NavigationRuntimeObjectDeclaration<'scope> {
#[webapi(slot = NAVIGATION_CURRENT_ENTRY_SLOT)]
current_entry: v8::Local<'scope, v8::Object>,
-
- #[webapi(data_property = "onnavigate", init = "null")]
- onnavigate: (),
-
- #[webapi(data_property = "onnavigatesuccess", init = "null")]
- onnavigatesuccess: (),
-
- #[webapi(data_property = "onnavigateerror", init = "null")]
- onnavigateerror: (),
-
- #[webapi(data_property = "oncurrententrychange", init = "null")]
- oncurrententrychange: (),
}
pub(in crate::context_bootstrap) fn build_history_runtime_state<'s>(
@@ -100,7 +88,6 @@ pub(in crate::context_bootstrap) fn build_navigation_runtime_state<'s>(
scope,
navigation,
NAVIGATION_EVENT_LISTENERS_SLOT,
- false,
);
super::super::shared_event_targets::install_handlers(scope, navigation, false);
let owner = history_window_owner(scope, window);
diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/clipboard.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/clipboard.rs
index ad70d63e6..38196355a 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/clipboard.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/clipboard.rs
@@ -1,4 +1,4 @@
-use super::super::{SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT};
+use super::super::SIMPLE_EVENT_TARGET_SLOT;
use crate::web_api_interfaces;
use crate::{
blob,
@@ -21,9 +21,6 @@ const CLIPBOARD_ITEM_PRESENTATION_STYLE_SLOT: &str = "__moliClipboardItemPresent
struct ClipboardObjectDeclaration {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = CLIPBOARD_EVENT_LISTENERS_SLOT)]
event_target_slot: (),
-
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
}
#[derive(Default, WebApiFunctionTemplate)]
diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/media_devices.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/media_devices.rs
index bdab11f97..5301cb6a7 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/media_devices.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/media_devices.rs
@@ -1,6 +1,6 @@
use super::super::window_runtime::navigator_media_devices_get_user_media_callback;
use super::super::*;
-use crate::util::{get_private_value, set_private_value, throw_type_error};
+use crate::util::{get_private_value, throw_type_error};
use crate::web_api_interfaces;
use moli_webapi_declare::{WebApiFunctionTemplate, WebApiObject};
@@ -15,9 +15,6 @@ struct MediaDevicesObjectDeclaration {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = MEDIA_DEVICES_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
-
#[webapi(slot = MEDIA_DEVICES_ONDEVICECHANGE_SLOT, init = "null")]
ondevicechange: (),
}
@@ -126,24 +123,12 @@ fn ondevicechange_setter<'s>(
throw_type_error(scope, "Illegal invocation");
return;
}
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(
- scope,
- args.this(),
- MEDIA_DEVICES_ONDEVICECHANGE_SLOT,
- stored,
- );
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
MEDIA_DEVICES_LISTENERS_SLOT,
"devicechange",
MEDIA_DEVICES_ONDEVICECHANGE_SLOT,
- stored.is_object(),
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
index f3f40fe71..6242f2382 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/navigator.rs
@@ -406,9 +406,6 @@ struct ServiceWorkerContainerDeclaration {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = SERVICE_WORKER_CONTAINER_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
-
#[webapi(slot = SERVICE_WORKER_CONTAINER_ONMESSAGE_SLOT, init = "null")]
_onmessage: (),
diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs
index c640f4664..f4f94dd86 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/screen.rs
@@ -566,9 +566,11 @@ fn screen_orientation_onchange_setter_callback<'s>(
throw_type_error(scope, "Illegal invocation");
return;
}
- set_private_value(
+ super::super::simple_object_event_set_handler(
scope,
args.this(),
+ SCREEN_ORIENTATION_EVENT_LISTENERS_SLOT,
+ "change",
SCREEN_ORIENTATION_ONCHANGE_SLOT,
args.get(0),
);
diff --git a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/visual_viewport.rs b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/visual_viewport.rs
index cdee656c7..af08f205a 100644
--- a/moli-renderer-v8/src/context_bootstrap/navigator_runtime/visual_viewport.rs
+++ b/moli-renderer-v8/src/context_bootstrap/navigator_runtime/visual_viewport.rs
@@ -37,6 +37,37 @@ struct VisualViewportObjectDeclaration {
#[derive(Default, WebApiFunctionTemplate)]
#[webapi(interface = web_api_interfaces::VisualViewport)]
struct VisualViewportPrototypeDeclaration {
+ #[webapi(
+ accessor_property = "onresize",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onresize"),
+ setter_data = v8str(scope, "onresize"),
+ enumerable,
+ receiver = web_api_interfaces::VisualViewport::is_instance
+ )]
+ onresize: (),
+ #[webapi(
+ accessor_property = "onscroll",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onscroll"),
+ setter_data = v8str(scope, "onscroll"),
+ enumerable,
+ receiver = web_api_interfaces::VisualViewport::is_instance
+ )]
+ onscroll: (),
+ #[webapi(
+ accessor_property = "onscrollend",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onscrollend"),
+ setter_data = v8str(scope, "onscrollend"),
+ enumerable,
+ receiver = web_api_interfaces::VisualViewport::is_instance
+ )]
+ onscrollend: (),
+
#[webapi(accessor_property, getter = visual_viewport_attribute_getter_callback, data = callback_data_index_value(scope, 0), enumerable)]
offset_left: (),
#[webapi(accessor_property, getter = visual_viewport_attribute_getter_callback, data = callback_data_index_value(scope, 1), enumerable)]
diff --git a/moli-renderer-v8/src/context_bootstrap/notification_runtime.rs b/moli-renderer-v8/src/context_bootstrap/notification_runtime.rs
index 715701dd3..2c1876e6e 100644
--- a/moli-renderer-v8/src/context_bootstrap/notification_runtime.rs
+++ b/moli-renderer-v8/src/context_bootstrap/notification_runtime.rs
@@ -1,6 +1,7 @@
use super::{
- SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT, global_constructor_object,
+ SIMPLE_EVENT_TARGET_SLOT, global_constructor_object,
simple_event_target_add_event_listener_callback, simple_event_target_dispatch_event_callback,
+ simple_event_target_handler_getter_callback, simple_event_target_handler_setter_callback,
simple_event_target_remove_event_listener_callback, structured_clone_value_for_storage,
};
use crate::web_api_interfaces;
@@ -98,21 +99,6 @@ struct NotificationObjectDeclaration<'scope> {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = NOTIFICATION_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
-
- #[webapi(data_property = "onclick", init = "null")]
- onclick: (),
-
- #[webapi(data_property = "onerror", init = "null")]
- onerror: (),
-
- #[webapi(data_property = "onshow", init = "null")]
- onshow: (),
-
- #[webapi(data_property = "onclose", init = "null")]
- onclose: (),
-
#[webapi(
method,
enumerable,
@@ -141,6 +127,47 @@ struct NotificationObjectDeclaration<'scope> {
#[derive(WebApiFunctionTemplate)]
#[webapi(interface = web_api_interfaces::Notification)]
struct NotificationPrototypeDeclaration {
+ #[webapi(
+ accessor_property = "onclick",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onclick"),
+ setter_data = v8str(scope, "onclick"),
+ enumerable,
+ receiver = web_api_interfaces::Notification::is_instance
+ )]
+ onclick: (),
+ #[webapi(
+ accessor_property = "onerror",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onerror"),
+ setter_data = v8str(scope, "onerror"),
+ enumerable,
+ receiver = web_api_interfaces::Notification::is_instance
+ )]
+ onerror: (),
+ #[webapi(
+ accessor_property = "onshow",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onshow"),
+ setter_data = v8str(scope, "onshow"),
+ enumerable,
+ receiver = web_api_interfaces::Notification::is_instance
+ )]
+ onshow: (),
+ #[webapi(
+ accessor_property = "onclose",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onclose"),
+ setter_data = v8str(scope, "onclose"),
+ enumerable,
+ receiver = web_api_interfaces::Notification::is_instance
+ )]
+ onclose: (),
+
#[webapi(
accessor_property,
getter = notification_title_getter_callback,
@@ -927,11 +954,7 @@ fn initialize_notification_object<'s>(
require_interaction: metadata.require_interaction,
actions: action_array,
event_target_slot: (),
- ordered_handlers: (),
- onclick: (),
- onerror: (),
- onshow: (),
- onclose: (),
+
add_event_listener: (),
remove_event_listener: (),
dispatch_event: (),
diff --git a/moli-renderer-v8/src/context_bootstrap/performance_runtime/install.rs b/moli-renderer-v8/src/context_bootstrap/performance_runtime/install.rs
index 3d1a47415..0ec226ec2 100644
--- a/moli-renderer-v8/src/context_bootstrap/performance_runtime/install.rs
+++ b/moli-renderer-v8/src/context_bootstrap/performance_runtime/install.rs
@@ -376,13 +376,8 @@ pub(in crate::context_bootstrap) fn install_worker_performance_runtime_state<'s>
)
.bind(scope)
.map_err(|error| anyhow!("failed to create worker performance: {error}"))?;
- install_simple_event_target_methods(
- scope,
- performance,
- PERFORMANCE_EVENT_LISTENERS_SLOT,
- false,
- );
- install_simple_event_target_ordered_handlers(scope, performance);
+ install_simple_event_target_methods(scope, performance, PERFORMANCE_EVENT_LISTENERS_SLOT);
+
define_global_value(scope, global, WINDOW_PERFORMANCE_SLOT, performance.into())
}
@@ -435,13 +430,8 @@ pub(super) fn create_performance_object<'s>(
PERFORMANCE_NAVIGATION_NAME_SEED_SLOT,
navigation_entry_name.into(),
);
- install_simple_event_target_methods(
- scope,
- performance,
- PERFORMANCE_EVENT_LISTENERS_SLOT,
- false,
- );
- install_simple_event_target_ordered_handlers(scope, performance);
+ install_simple_event_target_methods(scope, performance, PERFORMANCE_EVENT_LISTENERS_SLOT);
+
performance
}
diff --git a/moli-renderer-v8/src/context_bootstrap/performance_runtime/resource_buffer.rs b/moli-renderer-v8/src/context_bootstrap/performance_runtime/resource_buffer.rs
index b4e8bace1..1dc226309 100644
--- a/moli-renderer-v8/src/context_bootstrap/performance_runtime/resource_buffer.rs
+++ b/moli-renderer-v8/src/context_bootstrap/performance_runtime/resource_buffer.rs
@@ -140,25 +140,13 @@ fn on_resource_timing_buffer_full_setter<'s>(
_rv: v8::ReturnValue<'_, v8::Value>,
) {
let performance = args.this();
- let value = args.get(0);
- let handler = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(
- scope,
- performance,
- PERFORMANCE_ON_RESOURCE_TIMING_BUFFER_FULL_SLOT,
- handler,
- );
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
performance,
PERFORMANCE_EVENT_LISTENERS_SLOT,
RESOURCE_TIMING_BUFFER_FULL_EVENT,
PERFORMANCE_ON_RESOURCE_TIMING_BUFFER_FULL_SLOT,
- handler.is_object(),
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/picture_in_picture.rs b/moli-renderer-v8/src/context_bootstrap/picture_in_picture.rs
index b056dfcd0..b11038857 100644
--- a/moli-renderer-v8/src/context_bootstrap/picture_in_picture.rs
+++ b/moli-renderer-v8/src/context_bootstrap/picture_in_picture.rs
@@ -3,7 +3,7 @@
use super::media_queries;
use crate::{
- util::{get_private_value, set_private_value, v8str},
+ util::{get_private_value, v8str},
web_api_interfaces,
};
use moli_webapi_declare::WebApiFunctionTemplate;
@@ -75,15 +75,13 @@ fn resize_handler_setter<'s>(
_rv: v8::ReturnValue<'_, v8::Value>,
) {
let window = target(scope, args.this());
- let active = args.get(0).is_object();
- let handler = if active {
- args.get(0)
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, window, ON_RESIZE, handler);
- media_queries::simple_object_event_set_ordered_handler(
- scope, window, LISTENERS, "resize", ON_RESIZE, active,
+ media_queries::simple_object_event_set_handler(
+ scope,
+ window,
+ LISTENERS,
+ "resize",
+ ON_RESIZE,
+ args.get(0),
);
}
@@ -97,8 +95,6 @@ pub(crate) fn closed_window_for_test<'s>(
struct ClosedWindow {
#[webapi(slot = super::shared::SIMPLE_EVENT_TARGET_SLOT, value = LISTENERS)]
event_target: (),
- #[webapi(slot = super::shared::SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
}
ClosedWindow::default()
.bind(scope)
diff --git a/moli-renderer-v8/src/context_bootstrap/shared/slots.rs b/moli-renderer-v8/src/context_bootstrap/shared/slots.rs
index 3b5fc3b99..89178629b 100644
--- a/moli-renderer-v8/src/context_bootstrap/shared/slots.rs
+++ b/moli-renderer-v8/src/context_bootstrap/shared/slots.rs
@@ -37,8 +37,6 @@ pub(in crate::context_bootstrap) const WINDOW_PARENT_SLOT: &str = "__moliWindowP
pub(in crate::context_bootstrap) const WINDOW_TOP_SLOT: &str = "__moliWindowTop";
pub(in crate::context_bootstrap) const WINDOW_FRAMES_SLOT: &str = "__moliWindowFrames";
pub(crate) const SIMPLE_EVENT_TARGET_SLOT: &str = "__moliEventTargetSlot";
-pub(crate) const SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT: &str =
- "__moliSimpleEventTargetOrderedHandlers";
pub(in crate::context_bootstrap) const OFFLINE_AUDIO_LISTENERS_SLOT: &str =
"__moliOfflineAudioListeners";
pub(in crate::context_bootstrap) const OFFLINE_AUDIO_BUFFER_SLOT: &str = "__moliOfflineAudioBuffer";
diff --git a/moli-renderer-v8/src/context_bootstrap/shared_event_targets.rs b/moli-renderer-v8/src/context_bootstrap/shared_event_targets.rs
index 9deee4951..e59e7e08a 100644
--- a/moli-renderer-v8/src/context_bootstrap/shared_event_targets.rs
+++ b/moli-renderer-v8/src/context_bootstrap/shared_event_targets.rs
@@ -90,7 +90,6 @@ pub(super) fn install_handlers<'s>(
target: v8::Local<'s, v8::Object>,
entry: bool,
) {
- media_queries::install_simple_event_target_ordered_handlers(scope, target);
bind_shared_target(scope, target, target);
for (index, (property, _)) in HANDLERS.iter().enumerate() {
if (*property == "ondispose") != entry {
@@ -141,17 +140,15 @@ fn handler_setter<'s>(
return;
};
let target = args.this();
- let active = args.get(0).is_object();
- let value = if active {
- args.get(0)
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, target, slot, value);
let Some(listeners) = media_queries::simple_event_target_slot_name(scope, target) else {
return;
};
- media_queries::simple_object_event_set_ordered_handler(
- scope, target, &listeners, event_type, slot, active,
+ media_queries::simple_object_event_set_handler(
+ scope,
+ target,
+ &listeners,
+ event_type,
+ slot,
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs b/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs
index b2899208e..5b5de1119 100644
--- a/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs
+++ b/moli-renderer-v8/src/context_bootstrap/shared_worker_host.rs
@@ -7,10 +7,10 @@ use super::{
current_document_content_security_policies, current_document_referrer_policy,
document_referrer_policy_for_native_document,
},
- shared::{SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT},
+ shared::SIMPLE_EVENT_TARGET_SLOT,
simple_event_target_add_event_listener_callback, simple_event_target_dispatch_event_callback,
simple_event_target_remove_event_listener_callback, simple_object_event_listeners_snapshot,
- simple_object_event_set_ordered_handler,
+ simple_object_event_set_handler,
worker_host::{
document_query_encoding_override, is_cross_origin_http_worker_script,
materialize_worker_script_source, resolve_worker_script_url, throw_worker_dom_exception,
@@ -56,9 +56,6 @@ struct SharedWorkerObjectDeclaration<'scope> {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = SHARED_WORKER_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
-
#[webapi(slot = SHARED_WORKER_ONERROR_SLOT, init = "null")]
onerror_slot: (),
@@ -176,20 +173,13 @@ fn shared_worker_onerror_setter<'s>(
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, args.this(), SHARED_WORKER_ONERROR_SLOT, stored);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
SHARED_WORKER_LISTENERS_SLOT,
"error",
SHARED_WORKER_ONERROR_SLOT,
- stored.is_object(),
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/speech_synthesis.rs b/moli-renderer-v8/src/context_bootstrap/speech_synthesis.rs
index 4043fc1b2..579263803 100644
--- a/moli-renderer-v8/src/context_bootstrap/speech_synthesis.rs
+++ b/moli-renderer-v8/src/context_bootstrap/speech_synthesis.rs
@@ -1,7 +1,4 @@
-use super::{
- SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT,
- simple_object_event_set_ordered_handler,
-};
+use super::{SIMPLE_EVENT_TARGET_SLOT, simple_object_event_set_handler};
use crate::util::{
callback_data_index_value, callback_data_item, get_private_value, set_private_value,
throw_type_error,
@@ -54,9 +51,6 @@ struct SpeechSynthesisObjectDeclaration {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = SPEECH_SYNTHESIS_LISTENERS_SLOT)]
event_target_slot: (),
-
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
}
#[derive(Default, WebApiFunctionTemplate)]
@@ -150,9 +144,6 @@ struct SpeechSynthesisUtteranceObjectDeclaration<'scope> {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = SPEECH_UTTERANCE_LISTENERS_SLOT)]
event_target_slot: (),
-
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
}
#[derive(Default, WebApiFunctionTemplate)]
@@ -398,7 +389,6 @@ pub(in crate::context_bootstrap) fn speech_synthesis_utterance_constructor_callb
onmark: (),
onboundary: (),
event_target_slot: (),
- ordered_handlers: (),
};
if declaration.initialize(scope, utterance).is_err() {
rv.set_undefined();
@@ -531,13 +521,13 @@ fn speech_synthesis_onvoiceschanged_setter<'s>(
if !require_brand(scope, args.this(), "SpeechSynthesis") {
return;
}
- set_event_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
- args.get(0),
SPEECH_SYNTHESIS_LISTENERS_SLOT,
"voiceschanged",
SPEECH_SYNTHESIS_ONVOICESCHANGED_SLOT,
+ args.get(0),
);
}
@@ -728,13 +718,13 @@ fn speech_utterance_event_handler_setter<'s>(
) else {
return;
};
- set_event_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
- args.get(0),
SPEECH_UTTERANCE_LISTENERS_SLOT,
handler.event_type,
handler.slot,
+ args.get(0),
);
}
@@ -760,31 +750,6 @@ fn speech_voice_getter<'s>(
);
}
-fn set_event_handler<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
- value: v8::Local<'s, v8::Value>,
- listeners_slot: &'static str,
- event_type: &'static str,
- handler_slot: &'static str,
-) {
- let active = value.is_object();
- let stored = if active {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, target, handler_slot, stored);
- simple_object_event_set_ordered_handler(
- scope,
- target,
- listeners_slot,
- event_type,
- handler_slot,
- active,
- );
-}
-
fn require_brand<'s>(
scope: &mut v8::PinScope<'s, '_>,
receiver: v8::Local<'s, v8::Object>,
diff --git a/moli-renderer-v8/src/context_bootstrap/web_audio_runtime.rs b/moli-renderer-v8/src/context_bootstrap/web_audio_runtime.rs
index 89f4ec3e8..1c8aad0eb 100644
--- a/moli-renderer-v8/src/context_bootstrap/web_audio_runtime.rs
+++ b/moli-renderer-v8/src/context_bootstrap/web_audio_runtime.rs
@@ -146,8 +146,6 @@ struct OfflineAudioContextObjectDeclaration<'scope> {
state: &'static str,
#[webapi(data_property)]
destination: v8::Local<'scope, v8::Object>,
- #[webapi(data_property = "oncomplete", init = "null")]
- oncomplete: (),
#[webapi(method, enumerable, callback = simple_event_target_add_event_listener_callback)]
add_event_listener: (),
#[webapi(
@@ -378,11 +376,33 @@ struct AudioContextTemplateDeclaration {
constructor_length = 2,
enumerable
)]
-struct AudioWorkletNodeTemplateDeclaration {}
+struct AudioWorkletNodeTemplateDeclaration {
+ #[webapi(
+ accessor_property = "onprocessorerror",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onprocessorerror"),
+ setter_data = v8str(scope, "onprocessorerror"),
+ enumerable,
+ receiver = web_api_interfaces::AudioWorkletNode::is_instance
+ )]
+ onprocessorerror: (),
+}
#[derive(WebApiFunctionTemplate)]
#[webapi(interface = web_api_interfaces::BaseAudioContext, enumerable)]
struct BaseAudioContextPrototypeDeclaration {
+ #[webapi(
+ accessor_property = "onstatechange",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onstatechange"),
+ setter_data = v8str(scope, "onstatechange"),
+ enumerable,
+ receiver = web_api_interfaces::BaseAudioContext::is_instance
+ )]
+ onstatechange: (),
+
#[webapi(method = "createBiquadFilter", length = 0, callback = biquad::create_biquad_filter)]
create_biquad_filter: (),
@@ -411,6 +431,17 @@ struct BaseAudioContextPrototypeDeclaration {
#[derive(WebApiFunctionTemplate)]
#[webapi(interface = web_api_interfaces::OfflineAudioContext, enumerable)]
struct OfflineAudioContextPrototypeDeclaration {
+ #[webapi(
+ accessor_property = "oncomplete",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "oncomplete"),
+ setter_data = v8str(scope, "oncomplete"),
+ enumerable,
+ receiver = web_api_interfaces::OfflineAudioContext::is_instance
+ )]
+ oncomplete: (),
+
#[webapi(
method = "startRendering",
length = 0,
diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/bindings.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/bindings.rs
index 23f4bf13a..dd9399051 100644
--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/bindings.rs
+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/bindings.rs
@@ -111,9 +111,7 @@ pub(super) fn model_context_for_document<'s>(
.bind(scope) else {
return None;
};
- crate::context_bootstrap::media_queries::install_simple_event_target_ordered_handlers(
- scope, target,
- );
+
set_private_value(scope, document, MODEL_CONTEXT_SLOT, target.into());
if let Some(owner) = document_owner(unsafe { &*host_ptr }, handle) {
bind_document_target(scope, host_ptr, handle, target, owner);
diff --git a/moli-renderer-v8/src/context_bootstrap/web_mcp/events.rs b/moli-renderer-v8/src/context_bootstrap/web_mcp/events.rs
index 8bb5d163a..4e8ecbaf2 100644
--- a/moli-renderer-v8/src/context_bootstrap/web_mcp/events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/web_mcp/events.rs
@@ -4,7 +4,7 @@ use super::bindings::{check_target, document_owner, js_string};
use super::tasks::queue_task;
use crate::document_runtime::DomHandle;
use crate::native_bridge::JsContextHost;
-use crate::util::{get_private_value, set_private_value};
+use crate::util::get_private_value;
use crate::web_api_interfaces;
pub(super) const LISTENERS_SLOT: &str = "__moliModelContextListeners";
@@ -97,20 +97,13 @@ pub(super) fn handler_setter<'s>(
};
let target =
crate::context_bootstrap::shared_event_targets::shared_target_owner(scope, args.this());
- let active = args.get(0).is_object();
- let value = if active {
- args.get(0)
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, target, property, value);
- crate::context_bootstrap::media_queries::simple_object_event_set_ordered_handler(
+ crate::context_bootstrap::media_queries::simple_object_event_set_handler(
scope,
target,
LISTENERS_SLOT,
event_type,
property,
- active,
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/webrtc.rs b/moli-renderer-v8/src/context_bootstrap/webrtc.rs
index fd573340e..ccfab11d0 100644
--- a/moli-renderer-v8/src/context_bootstrap/webrtc.rs
+++ b/moli-renderer-v8/src/context_bootstrap/webrtc.rs
@@ -95,8 +95,6 @@ struct RtcPeerConnectionObjectDeclaration<'scope> {
has_data_channel: (),
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = RTC_PEER_CONNECTION_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
}
#[derive(WebApiObject)]
@@ -124,8 +122,6 @@ struct RtcDataChannelObjectDeclaration<'scope> {
binary_type: (),
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = RTC_DATA_CHANNEL_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
}
#[derive(WebApiObject)]
@@ -260,7 +256,6 @@ pub(in crate::context_bootstrap) fn rtc_peer_connection_constructor_callback<'s>
pending_local_description: (),
has_data_channel: (),
event_target_slot: (),
- ordered_handlers: (),
};
if declaration.initialize(scope, args.this()).is_err() {
rv.set_undefined();
diff --git a/moli-renderer-v8/src/context_bootstrap/websocket.rs b/moli-renderer-v8/src/context_bootstrap/websocket.rs
index 376829bfc..fa04eab2e 100644
--- a/moli-renderer-v8/src/context_bootstrap/websocket.rs
+++ b/moli-renderer-v8/src/context_bootstrap/websocket.rs
@@ -1,12 +1,11 @@
use super::media_queries::{
dispatch_simple_event_target_event, simple_event_target_add_event_listener_callback,
simple_event_target_dispatch_event_callback,
- simple_event_target_remove_event_listener_callback, simple_object_event_set_ordered_handler,
+ simple_event_target_remove_event_listener_callback, simple_object_event_set_handler,
};
use super::shared::{
- READABLE_STREAM_HWM_SLOT, READABLE_STREAM_PENDING_READS_SLOT,
- SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT, WRITABLE_STREAM_SINK_SLOT,
- define_non_enumerable_string_property, global_constructor_prototype,
+ READABLE_STREAM_HWM_SLOT, READABLE_STREAM_PENDING_READS_SLOT, SIMPLE_EVENT_TARGET_SLOT,
+ WRITABLE_STREAM_SINK_SLOT, define_non_enumerable_string_property, global_constructor_prototype,
new_uint8_array_from_bytes,
};
use super::stream_adapter::{
diff --git a/moli-renderer-v8/src/context_bootstrap/websocket/accessors.rs b/moli-renderer-v8/src/context_bootstrap/websocket/accessors.rs
index 409f3bb05..e29bbf4b2 100644
--- a/moli-renderer-v8/src/context_bootstrap/websocket/accessors.rs
+++ b/moli-renderer-v8/src/context_bootstrap/websocket/accessors.rs
@@ -272,19 +272,12 @@ fn websocket_event_handler_setter_function<'s>(
) else {
return;
};
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- super::helpers::set_websocket_value_slot(scope, args.this(), handler.slot_name, stored);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
WEBSOCKET_LISTENERS_SLOT,
handler.event_type,
handler.slot_name,
- stored.is_object(),
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/websocket/constructor.rs b/moli-renderer-v8/src/context_bootstrap/websocket/constructor.rs
index d575cc484..da1fdefdc 100644
--- a/moli-renderer-v8/src/context_bootstrap/websocket/constructor.rs
+++ b/moli-renderer-v8/src/context_bootstrap/websocket/constructor.rs
@@ -51,9 +51,6 @@ struct WebSocketObjectDeclaration {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = WEBSOCKET_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
-
#[webapi(method, enumerable, callback = simple_event_target_add_event_listener_callback)]
add_event_listener: (),
diff --git a/moli-renderer-v8/src/context_bootstrap/window_events.rs b/moli-renderer-v8/src/context_bootstrap/window_events.rs
index 7632084d8..93a99b859 100644
--- a/moli-renderer-v8/src/context_bootstrap/window_events.rs
+++ b/moli-renderer-v8/src/context_bootstrap/window_events.rs
@@ -140,6 +140,12 @@ pub(crate) const WINDOW_EVENT_HANDLER_PROPERTIES: &[&str] = &[
"onwheel",
];
+pub(crate) fn is_window_event_handler_property(property: &str) -> bool {
+ WINDOW_EVENT_HANDLER_PROPERTIES.contains(&property)
+ || SECURE_WINDOW_EVENT_HANDLER_PROPERTIES.contains(&property)
+ || SECURE_GLOBAL_EVENT_HANDLER_PROPERTIES.contains(&property)
+}
+
pub(crate) use accessors::{
set_window_body_onerror_handler_compiled, set_window_onerror_handler_value,
window_body_onerror_handler_is_compiled,
@@ -163,6 +169,9 @@ pub(crate) use error::{
};
pub(crate) use install::event_handler_property_is_exposed;
pub(super) use install::install_window_global_accessors;
+pub(crate) use install::{
+ clear_simple_window_event_handler_values, install_simple_window_event_handlers,
+};
pub(crate) use promise::dispatch_window_promise_rejection_event;
pub(in crate::context_bootstrap) use install::{
diff --git a/moli-renderer-v8/src/context_bootstrap/window_events/install.rs b/moli-renderer-v8/src/context_bootstrap/window_events/install.rs
index 7089d308f..4c97bf8b2 100644
--- a/moli-renderer-v8/src/context_bootstrap/window_events/install.rs
+++ b/moli-renderer-v8/src/context_bootstrap/window_events/install.rs
@@ -10,9 +10,38 @@ use super::{
WINDOW_EVENT_HANDLER_PROPERTIES,
};
use crate::definitions::define_function_accessor_property;
-use crate::util::{get_private_value, v8str};
+use crate::util::{get_private_value, set_private_value, v8str};
use moli_webapi_declare::WebApiObject;
+pub(crate) fn install_simple_window_event_handlers<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ window: v8::Local<'s, v8::Object>,
+) {
+ let properties: Vec<_> = WINDOW_EVENT_HANDLER_PROPERTIES
+ .iter()
+ .chain(SECURE_WINDOW_EVENT_HANDLER_PROPERTIES)
+ .chain(SECURE_GLOBAL_EVENT_HANDLER_PROPERTIES)
+ .copied()
+ .filter(|property| event_handler_property_is_exposed(scope, window, property))
+ .collect();
+ super::super::install_simple_event_target_handlers(scope, window, &properties);
+}
+
+// The listener registry is discarded when the lightweight Window navigates.
+// Clear its handler values too, without invoking author-defined property setters.
+pub(crate) fn clear_simple_window_event_handler_values<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ window: v8::Local<'s, v8::Object>,
+) {
+ for property in WINDOW_EVENT_HANDLER_PROPERTIES
+ .iter()
+ .chain(SECURE_WINDOW_EVENT_HANDLER_PROPERTIES)
+ .chain(SECURE_GLOBAL_EVENT_HANDLER_PROPERTIES)
+ {
+ set_private_value(scope, window, property, v8::null(scope).into());
+ }
+}
+
#[derive(Default, WebApiObject)]
#[webapi(fragment, prototype = "Window")]
struct WindowGlobalEventHandlerAccessorsDeclaration {
diff --git a/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs b/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs
index f63a7d932..876b1c6b7 100644
--- a/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs
+++ b/moli-renderer-v8/src/context_bootstrap/window_runtime/service_worker.rs
@@ -42,6 +42,17 @@ const SERVICE_WORKER_CONTAINER_CONTROLLER_SLOT: &str = "__moliServiceWorkerConta
#[derive(WebApiObject)]
#[webapi(interface = web_api_interfaces::ServiceWorkerRegistration)]
struct ServiceWorkerRegistrationObjectDeclaration<'scope> {
+ #[webapi(
+ accessor_property = "onupdatefound",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onupdatefound"),
+ setter_data = v8str(scope, "onupdatefound"),
+ enumerable,
+ receiver = web_api_interfaces::ServiceWorkerRegistration::is_instance
+ )]
+ onupdatefound: (),
+
#[webapi(data_property, readonly)]
scope: String,
@@ -252,6 +263,27 @@ struct ServiceWorkerPushSubscriptionDeclaration<'scope> {
#[derive(WebApiObject)]
#[webapi(interface = web_api_interfaces::ServiceWorker)]
struct ServiceWorkerObjectDeclaration {
+ #[webapi(
+ accessor_property = "onstatechange",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onstatechange"),
+ setter_data = v8str(scope, "onstatechange"),
+ enumerable,
+ receiver = web_api_interfaces::ServiceWorker::is_instance
+ )]
+ onstatechange: (),
+ #[webapi(
+ accessor_property = "onerror",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onerror"),
+ setter_data = v8str(scope, "onerror"),
+ enumerable,
+ receiver = web_api_interfaces::ServiceWorker::is_instance
+ )]
+ onerror: (),
+
#[webapi(data_property = "scriptURL", readonly)]
script_url: String,
@@ -991,25 +1023,13 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_message_handler_set
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(
- scope,
- args.this(),
- SERVICE_WORKER_CONTAINER_ONMESSAGE_SLOT,
- stored,
- );
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
SERVICE_WORKER_CONTAINER_LISTENERS_SLOT,
"message",
SERVICE_WORKER_CONTAINER_ONMESSAGE_SLOT,
- stored.is_object(),
+ args.get(0),
);
}
@@ -1036,25 +1056,13 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_messageerror_handle
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(
- scope,
- args.this(),
- SERVICE_WORKER_CONTAINER_ONMESSAGEERROR_SLOT,
- stored,
- );
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
SERVICE_WORKER_CONTAINER_LISTENERS_SLOT,
"messageerror",
SERVICE_WORKER_CONTAINER_ONMESSAGEERROR_SLOT,
- stored.is_object(),
+ args.get(0),
);
}
@@ -1081,25 +1089,13 @@ pub(in crate::context_bootstrap) fn navigator_service_worker_controllerchange_ha
args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(
- scope,
- args.this(),
- SERVICE_WORKER_CONTAINER_ONCONTROLLERCHANGE_SLOT,
- stored,
- );
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
SERVICE_WORKER_CONTAINER_LISTENERS_SLOT,
"controllerchange",
SERVICE_WORKER_CONTAINER_ONCONTROLLERCHANGE_SLOT,
- stored.is_object(),
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs b/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs
index 14477d208..8599413d6 100644
--- a/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs
+++ b/moli-renderer-v8/src/context_bootstrap/worker_host/constructor.rs
@@ -52,9 +52,6 @@ struct WorkerObjectDeclaration {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = WORKER_LISTENERS_SLOT)]
event_target_slot: (),
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
-
#[webapi(slot = WORKER_ONMESSAGE_SLOT, init = "null")]
onmessage_slot: (),
@@ -695,22 +692,15 @@ fn worker_event_handler_setter<'s>(
else {
return;
};
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, args.this(), handler.slot_name, stored);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
WORKER_LISTENERS_SLOT,
handler.event_type,
handler.slot_name,
- stored.is_object(),
+ args.get(0),
);
- if handler.event_type == "message" && stored.is_object() {
+ if handler.event_type == "message" && args.get(0).is_object() {
super::flush_pending_worker_messages_for_listener(scope, args.this());
}
}
diff --git a/moli-renderer-v8/src/context_bootstrap/worker_host/mod.rs b/moli-renderer-v8/src/context_bootstrap/worker_host/mod.rs
index 47989de2c..f782221a7 100644
--- a/moli-renderer-v8/src/context_bootstrap/worker_host/mod.rs
+++ b/moli-renderer-v8/src/context_bootstrap/worker_host/mod.rs
@@ -1,8 +1,8 @@
use super::media_queries::{
simple_event_target_add_event_listener_callback, simple_event_target_dispatch_event_callback,
- simple_event_target_remove_event_listener_callback, simple_object_event_set_ordered_handler,
+ simple_event_target_remove_event_listener_callback, simple_object_event_set_handler,
};
-use super::shared::{SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT};
+use super::shared::SIMPLE_EVENT_TARGET_SLOT;
use crate::{
util::context_host_ptr_from_global_bridge,
util::{
diff --git a/moli-renderer-v8/src/native_bridge/context_host/popups.rs b/moli-renderer-v8/src/native_bridge/context_host/popups.rs
index bfe6e2d27..cc4f96f77 100644
--- a/moli-renderer-v8/src/native_bridge/context_host/popups.rs
+++ b/moli-renderer-v8/src/native_bridge/context_host/popups.rs
@@ -1,15 +1,14 @@
mod renderer_owned;
-use super::{
- JsContextHost, NavigationHistoryEntrySeed, child_frame_runtime::WINDOW_EVENT_HANDLER_PROPERTIES,
-};
+use super::{JsContextHost, NavigationHistoryEntrySeed};
use crate::web_api_interfaces;
use crate::{
content_security_policy::content_security_policy_forces_opaque_origin,
context_bootstrap::{
SharedWebStorageStore, WINDOW_NAME_SLOT, apply_local_window_location_navigation,
- deep_clone_shared_web_storage_store, dispatch_simple_event_target_event,
- install_navigation_bootstrap_entry_for_holder, install_simple_event_target_methods,
+ clear_simple_window_event_handler_values, deep_clone_shared_web_storage_store,
+ dispatch_simple_event_target_event, install_navigation_bootstrap_entry_for_holder,
+ install_simple_event_target_methods, install_simple_window_event_handlers,
install_storage_aliases_for_window,
install_window_location_history_navigation_runtime_state, new_shared_web_storage_store,
scoped_indexed_db_factory, sync_document_location_runtime_state_from_window,
@@ -867,12 +866,8 @@ impl JsContextHost {
}
}
let _ = install_storage_aliases_for_window(scope, window);
- install_simple_event_target_methods(
- scope,
- window,
- LIGHTWEIGHT_POPUP_EVENT_LISTENERS_SLOT,
- false,
- );
+ install_simple_event_target_methods(scope, window, LIGHTWEIGHT_POPUP_EVENT_LISTENERS_SLOT);
+ install_simple_window_event_handlers(scope, window);
let _ = LightweightPopupWindowMethodsDeclaration::default().initialize(scope, window);
let initial_document_owner = self.allocate_lightweight_popup_document_owner(popup_id);
let initial_local_window_id = self.allocate_lightweight_popup_local_window_id();
@@ -3794,7 +3789,7 @@ impl JsContextHost {
document_remained_current = false;
break;
}
- set_object_slot(scope, window, &name, value);
+ set_lightweight_popup_script_global(scope, window, &name, value);
if !self.lightweight_popup_document_owner_is_current(script_document_owner) {
document_remained_current = false;
break;
@@ -3821,7 +3816,7 @@ impl JsContextHost {
if value.is_undefined() {
continue;
}
- set_object_slot(scope, window, &name, value);
+ set_lightweight_popup_script_global(scope, window, &name, value);
if !self.lightweight_popup_document_owner_is_current(script_document_owner) {
document_remained_current = false;
break;
@@ -4920,6 +4915,21 @@ fn sync_lightweight_popup_window_location<'s>(
}
}
+fn set_lightweight_popup_script_global(
+ scope: &mut v8::PinScope<'_, '_>,
+ window: v8::Local<'_, v8::Object>,
+ name: &str,
+ value: v8::Local<'_, v8::Value>,
+) {
+ // Exporting a script global must retain Window's handler accessor and its
+ // registration position, rather than replacing it with a data property.
+ if crate::context_bootstrap::is_window_event_handler_property(name) {
+ set_object_value(scope, window, name, value);
+ } else {
+ set_object_slot(scope, window, name, value);
+ }
+}
+
fn clear_lightweight_popup_window_document_event_state<'s>(
scope: &mut v8::PinScope<'s, '_>,
window: v8::Local<'s, v8::Object>,
@@ -4931,10 +4941,7 @@ fn clear_lightweight_popup_window_document_event_state<'s>(
LIGHTWEIGHT_POPUP_EVENT_LISTENERS_SLOT,
undefined.into(),
);
- let null = v8::null(scope).into();
- for name in WINDOW_EVENT_HANDLER_PROPERTIES {
- let _ = window.set(scope, v8str(scope, name).into(), null);
- }
+ clear_simple_window_event_handler_values(scope, window);
}
fn lightweight_popup_effective_navigation_kind(
diff --git a/moli-renderer-v8/src/native_bridge/document/detached_install/accessors/iframe_window_messaging.rs b/moli-renderer-v8/src/native_bridge/document/detached_install/accessors/iframe_window_messaging.rs
index a1ba0c98f..a427c13f3 100644
--- a/moli-renderer-v8/src/native_bridge/document/detached_install/accessors/iframe_window_messaging.rs
+++ b/moli-renderer-v8/src/native_bridge/document/detached_install/accessors/iframe_window_messaging.rs
@@ -2,6 +2,7 @@ use crate::{
context_bootstrap::{
dispatch_simple_event_target_event, install_child_window_eval_runtime_state,
install_child_window_own_methods, install_simple_event_target_methods,
+ install_simple_window_event_handlers,
},
util::v8str,
};
@@ -22,12 +23,8 @@ pub(super) fn install_detached_iframe_window_messaging<'s>(
scope: &mut v8::PinScope<'s, '_>,
window: v8::Local<'s, v8::Object>,
) {
- install_simple_event_target_methods(
- scope,
- window,
- DETACHED_IFRAME_WINDOW_EVENT_LISTENERS_SLOT,
- false,
- );
+ install_simple_event_target_methods(scope, window, DETACHED_IFRAME_WINDOW_EVENT_LISTENERS_SLOT);
+ install_simple_window_event_handlers(scope, window);
let _ = DetachedIframeWindowMethodsDeclaration::default().initialize(scope, window);
let _ = install_child_window_own_methods(scope, window);
let _ = install_child_window_eval_runtime_state(scope, window);
diff --git a/moli-renderer-v8/src/native_bridge/element/media/text_tracks.rs b/moli-renderer-v8/src/native_bridge/element/media/text_tracks.rs
index 064605d65..e0821d154 100644
--- a/moli-renderer-v8/src/native_bridge/element/media/text_tracks.rs
+++ b/moli-renderer-v8/src/native_bridge/element/media/text_tracks.rs
@@ -1,5 +1,6 @@
use crate::context_bootstrap::{
dispatch_simple_event_target_event, mark_simple_event_target_slot, set_text_track_cue_track,
+ simple_event_target_slot_name, simple_object_event_set_handler,
};
use crate::document_runtime::DomHandle;
use crate::dom::native::Node;
@@ -434,6 +435,7 @@ fn text_track_list_onaddtrack_setter<'s>(
scope,
receiver,
args.get(0),
+ "addtrack",
TEXT_TRACK_LIST_ONADDTRACK_SLOT,
);
}
@@ -461,6 +463,7 @@ fn text_track_list_onremovetrack_setter<'s>(
scope,
receiver,
args.get(0),
+ "removetrack",
TEXT_TRACK_LIST_ONREMOVETRACK_SLOT,
);
}
@@ -910,7 +913,13 @@ fn text_track_oncuechange_setter<'s>(
let Some(receiver) = text_track_receiver(scope, &args) else {
return;
};
- text_track_event_handler_setter(scope, receiver, args.get(0), TEXT_TRACK_ONCUECHANGE_SLOT);
+ text_track_event_handler_setter(
+ scope,
+ receiver,
+ args.get(0),
+ "cuechange",
+ TEXT_TRACK_ONCUECHANGE_SLOT,
+ );
}
fn text_track_event_handler_getter<'s>(
@@ -926,18 +935,13 @@ fn text_track_event_handler_setter<'s>(
scope: &mut v8::PinScope<'s, '_>,
receiver: v8::Local<'s, v8::Object>,
value: v8::Local<'s, v8::Value>,
+ event_type: &str,
slot: &'static str,
) {
- set_private_value(
- scope,
- receiver,
- slot,
- if value.is_function() {
- value
- } else {
- v8::null(scope).into()
- },
- );
+ let Some(listeners_slot) = simple_event_target_slot_name(scope, receiver) else {
+ return;
+ };
+ simple_object_event_set_handler(scope, receiver, &listeners_slot, event_type, slot, value);
}
fn text_track_add_cue_callback<'s>(
diff --git a/moli-renderer-v8/src/network_host.rs b/moli-renderer-v8/src/network_host.rs
index dcf09b089..c1bff22a9 100644
--- a/moli-renderer-v8/src/network_host.rs
+++ b/moli-renderer-v8/src/network_host.rs
@@ -291,7 +291,6 @@ use super::{
blob,
context_bootstrap::{new_readable_stream_from_array_buffer, new_readable_stream_from_source},
dom_parser,
- exception_reporting::invoke_callback,
native_bridge::JsContextHost,
page_task_queue::RendererResourceCompletionSender,
types::{
diff --git a/moli-renderer-v8/src/network_host/event_source.rs b/moli-renderer-v8/src/network_host/event_source.rs
index 0a5065287..c755fcd4b 100644
--- a/moli-renderer-v8/src/network_host/event_source.rs
+++ b/moli-renderer-v8/src/network_host/event_source.rs
@@ -3,8 +3,7 @@ mod parser;
mod request;
use crate::context_bootstrap::{
- SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT,
- dispatch_simple_event_target_event, simple_object_event_set_ordered_handler,
+ SIMPLE_EVENT_TARGET_SLOT, dispatch_simple_event_target_event, simple_object_event_set_handler,
};
use crate::util::{
callback_data_index_value, callback_data_item, context_host_ptr_from_global_bridge,
diff --git a/moli-renderer-v8/src/network_host/event_source/bindings.rs b/moli-renderer-v8/src/network_host/event_source/bindings.rs
index 570471146..a4732795f 100644
--- a/moli-renderer-v8/src/network_host/event_source/bindings.rs
+++ b/moli-renderer-v8/src/network_host/event_source/bindings.rs
@@ -41,9 +41,6 @@ struct EventSourceObjectDeclaration<'scope> {
#[webapi(slot = SIMPLE_EVENT_TARGET_SLOT, value = EVENT_SOURCE_LISTENERS_SLOT)]
event_target_slot: (),
-
- #[webapi(slot = SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, init = true)]
- ordered_handlers: (),
}
#[derive(WebApiFunctionTemplate)]
@@ -541,20 +538,13 @@ fn event_source_event_handler_setter<'s>(
) else {
return;
};
- let value = args.get(0);
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- set_private_value(scope, args.this(), handler.slot_name, stored);
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
args.this(),
EVENT_SOURCE_LISTENERS_SLOT,
handler.event_type,
handler.slot_name,
- stored.is_object(),
+ args.get(0),
);
}
diff --git a/moli-renderer-v8/src/network_host/xhr.rs b/moli-renderer-v8/src/network_host/xhr.rs
index 54eb60232..754f64b83 100644
--- a/moli-renderer-v8/src/network_host/xhr.rs
+++ b/moli-renderer-v8/src/network_host/xhr.rs
@@ -7,9 +7,7 @@ mod response_type;
mod send;
use super::*;
-use crate::context_bootstrap::{
- SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, SIMPLE_EVENT_TARGET_SLOT,
-};
+use crate::context_bootstrap::SIMPLE_EVENT_TARGET_SLOT;
use crate::native_bridge::throw_dom_exception;
use crate::util::{get_private_value, private_key};
use crate::web_api_interfaces;
@@ -46,7 +44,6 @@ const XHR_PENDING_BODY_LENGTH_SLOT: &str = "__lmXhrPendingBodyLength";
const XHR_PENDING_HEADERS_SLOT: &str = "__lmXhrPendingHeadersJson";
pub(crate) const XHR_ACTIVE_INTERNAL_ID_SLOT: &str = "__lmXhrActiveInternalId";
pub(crate) const XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT: &str = "__moliXhrEventTargetListeners";
-pub(crate) const XHR_SIMPLE_EVENT_TARGET_MARKER_SLOT: &str = "__moliXhrUsesSimpleEventTarget";
pub(crate) use self::bindings::{
install_window_xml_http_request_template_bindings, install_xml_http_request_bindings,
@@ -101,23 +98,15 @@ pub(crate) fn finalize_xml_http_request_event_target_realm_bindings<'s>(
scope: &mut v8::PinScope<'s, '_>,
event_target_prototype: v8::Local<'s, v8::Object>,
) -> anyhow::Result<()> {
- let marker: v8::Local<'_, v8::Value> = v8::Boolean::new(scope, true).into();
- for (slot, value) in [
- (
- SIMPLE_EVENT_TARGET_SLOT,
- v8str(scope, XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT).into(),
- ),
- (SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT, marker),
- (XHR_SIMPLE_EVENT_TARGET_MARKER_SLOT, marker),
- ] {
- let key = private_key(scope, slot).ok_or_else(|| {
- anyhow::anyhow!("failed to allocate XMLHttpRequestEventTarget slot `{slot}`")
- })?;
- if event_target_prototype.set_private(scope, key, value) != Some(true) {
- return Err(anyhow::anyhow!(
- "failed to finalize XMLHttpRequestEventTarget slot `{slot}`"
- ));
- }
+ let slot = SIMPLE_EVENT_TARGET_SLOT;
+ let key = private_key(scope, slot).ok_or_else(|| {
+ anyhow::anyhow!("failed to allocate XMLHttpRequestEventTarget slot `{slot}`")
+ })?;
+ let value = v8str(scope, XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT).into();
+ if event_target_prototype.set_private(scope, key, value) != Some(true) {
+ return Err(anyhow::anyhow!(
+ "failed to finalize XMLHttpRequestEventTarget slot `{slot}`"
+ ));
}
Ok(())
}
diff --git a/moli-renderer-v8/src/network_host/xhr/bindings/constants.rs b/moli-renderer-v8/src/network_host/xhr/bindings/constants.rs
index eaf5cca5c..96de07f17 100644
--- a/moli-renderer-v8/src/network_host/xhr/bindings/constants.rs
+++ b/moli-renderer-v8/src/network_host/xhr/bindings/constants.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::context_bootstrap::simple_object_event_set_ordered_handler;
+use crate::context_bootstrap::simple_object_event_set_handler;
use crate::util::{
callback_data_index_value, callback_data_item, get_private_value, set_private_value,
};
@@ -412,9 +412,9 @@ fn xhr_with_credentials_setter<'s>(
set_xhr_state_bool(scope, xhr, XHR_WITH_CREDENTIALS_SLOT, parsed.value);
}
-fn xhr_value_setter(
- scope: &mut v8::PinScope<'_, '_>,
- args: v8::FunctionCallbackArguments<'_>,
+fn xhr_value_setter<'s>(
+ scope: &mut v8::PinScope<'s, '_>,
+ args: v8::FunctionCallbackArguments<'s>,
_rv: v8::ReturnValue<'_, v8::Value>,
) {
let Some(xhr) = args.this().to_object(scope) else {
@@ -443,16 +443,17 @@ fn xhr_value_setter(
value
};
set_xhr_state_value(scope, xhr, key, stored);
- set_private_value(scope, xhr, key, stored);
if let Some(event_type) = xhr_event_type_for_handler_slot(key) {
- simple_object_event_set_ordered_handler(
+ simple_object_event_set_handler(
scope,
xhr,
XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT,
event_type,
key,
- stored.is_object(),
+ stored,
);
+ } else {
+ set_private_value(scope, xhr, key, stored);
}
}
diff --git a/moli-renderer-v8/src/network_host/xhr/events/dispatch.rs b/moli-renderer-v8/src/network_host/xhr/events/dispatch.rs
index 7776e965c..5b4f4a578 100644
--- a/moli-renderer-v8/src/network_host/xhr/events/dispatch.rs
+++ b/moli-renderer-v8/src/network_host/xhr/events/dispatch.rs
@@ -2,7 +2,6 @@ use super::super::*;
use crate::context_bootstrap::{
dispatch_simple_event_target_event, simple_object_event_listeners_snapshot,
};
-use crate::util::get_private_value;
use moli_webapi_declare::WebApiObject;
#[derive(WebApiObject)]
@@ -30,66 +29,30 @@ pub(in crate::network_host::xhr) fn xhr_fire_readystatechange(
let event = XhrReadyStateChangeEventDeclaration::new("readystatechange", xhr, xhr)
.bind(scope)
.expect("XHR readystatechange event declaration should bind");
- if xhr_uses_simple_event_target(scope, xhr) {
- let _ = dispatch_simple_event_target_event(
- scope,
- xhr,
- XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT,
- "readystatechange",
- event,
- );
- return;
- }
-
- let handler_val = match xhr.get(scope, v8str(scope, "onreadystatechange").into()) {
- Some(v) => v,
- None => return,
- };
- let Ok(handler) = v8::Local::<v8::Function>::try_from(handler_val) else {
- return;
- };
- let _ = invoke_callback(
+ let _ = dispatch_simple_event_target_event(
scope,
- "XMLHttpRequest.onreadystatechange",
- handler,
- xhr.into(),
- &[event.into()],
+ xhr,
+ XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT,
+ "readystatechange",
+ event,
);
}
-pub(crate) fn xhr_invoke_handler(
+fn xhr_dispatch_event(
scope: &mut v8::PinScope<'_, '_>,
xhr: v8::Local<'_, v8::Object>,
- handler_name: &str,
+ event_type: &str,
event: v8::Local<'_, v8::Object>,
) {
- // `event` objects may be created in this scope or passed through other helpers. Re-root
- // both sides before reporting so the structured logging path can use one coherent scope.
let xhr = local_object_in_scope(scope, xhr);
let event = local_object_in_scope(scope, event);
- if xhr_uses_simple_event_target(scope, xhr) {
- let event_type = handler_name.strip_prefix("on").unwrap_or(handler_name);
- let _ = dispatch_simple_event_target_event(
- scope,
- xhr,
- XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT,
- event_type,
- event,
- );
- return;
- }
- let Some(key) = v8_string(scope, handler_name) else {
- return;
- };
- let handler_val = match xhr.get(scope, key.into()) {
- Some(v) => v,
- None => return,
- };
- let Ok(handler) = v8::Local::<v8::Function>::try_from(handler_val) else {
- return;
- };
- let callback_name = format!("XMLHttpRequest.{handler_name}");
- let _ = invoke_callback(scope, &callback_name, handler, xhr.into(), &[event.into()]);
+ let _ = dispatch_simple_event_target_event(
+ scope,
+ xhr,
+ XHR_SIMPLE_EVENT_TARGET_LISTENERS_SLOT,
+ event_type,
+ event,
+ );
}
pub(crate) fn xhr_dispatch_progress_event(
@@ -129,8 +92,7 @@ pub(crate) fn xhr_dispatch_progress_event_with_length_computable(
loaded,
total,
);
- let handler_name = format!("on{event_type}");
- xhr_invoke_handler(scope, xhr, &handler_name, event);
+ xhr_dispatch_event(scope, xhr, event_type, event);
}
pub(crate) fn xhr_dispatch_upload_progress_event(
@@ -151,8 +113,7 @@ pub(crate) fn xhr_dispatch_upload_progress_event(
}
let event =
super::progress::make_progress_event(scope, event_type, upload, total > 0.0, loaded, total);
- let handler_name = format!("on{event_type}");
- xhr_invoke_handler(scope, upload, &handler_name, event);
+ xhr_dispatch_event(scope, upload, event_type, event);
}
fn local_object_in_scope<'s>(
@@ -172,44 +133,11 @@ fn local_object_in_scope<'s>(
v8::Local::new(scope, global)
}
-fn xhr_uses_simple_event_target<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- xhr: v8::Local<'_, v8::Object>,
-) -> bool {
- let xhr = local_object_in_scope(scope, xhr);
- let mut current: Option<v8::Local<'s, v8::Value>> = Some(xhr.into());
- while let Some(value) = current {
- if value.is_null_or_undefined() {
- return false;
- }
- let Ok(object) = v8::Local::<v8::Object>::try_from(value) else {
- return false;
- };
- if get_private_value(scope, object, XHR_SIMPLE_EVENT_TARGET_MARKER_SLOT)
- .is_some_and(|marker| marker.is_true())
- {
- return true;
- }
- current = object.get_prototype(scope);
- }
- false
-}
-
fn xhr_has_event_observers<'s>(
scope: &mut v8::PinScope<'s, '_>,
xhr: v8::Local<'s, v8::Object>,
event_type: &str,
) -> bool {
- let handler_name = format!("on{event_type}");
- let has_handler = v8_string(scope, &handler_name)
- .and_then(|key| xhr.get(scope, key.into()))
- .is_some_and(|value| value.is_function());
- if has_handler {
- return true;
- }
- if !xhr_uses_simple_event_target(scope, xhr) {
- return false;
- }
!simple_object_event_listeners_snapshot(
scope,
xhr,
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/popup_window.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/popup_window.rs
index 2040e7fad..0996d8d4e 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/popup_window.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/misc/extracted/popup_window.rs
@@ -926,6 +926,9 @@ async fn lightweight_popup_cross_document_navigation_clears_old_onload_handler()
.eval(
r#"
(() => {
+ if (typeof Object.getOwnPropertyDescriptor(__popupOnloadWindow, "onload").set !== "function") {
+ throw new Error("popup script exports replaced the Window handler accessor");
+ }
const reopened = open(__popupOnloadSecondUrl, "popupOnloadClearWindow");
return [
reopened === __popupOnloadWindow,
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/mod.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/mod.rs
index 9adfe25c6..91a315bc2 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/mod.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/mod.rs
@@ -50,6 +50,7 @@ mod security_policy;
mod security_policy_event_init;
mod service_worker_drain;
mod session_description;
+mod simple_event_target_handlers;
mod simple_handler_object;
mod speech_synthesis;
mod storage_access;
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.js b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.js
new file mode 100644
index 000000000..79d16a0b1
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.js
@@ -0,0 +1,73 @@
+function checkHandlerDispatch(target, type, realm = globalThis) {
+ const property = 'on' + type;
+ const trace = [];
+ const check = (actual, expected, step) => {
+ if (JSON.stringify(actual) !== JSON.stringify(expected)) {
+ throw new Error(`${target.constructor.name}.${property} ${step}: ${JSON.stringify(actual)}`);
+ }
+ };
+ const fire = () => target.dispatchEvent(new realm.Event(type, {cancelable: true}));
+ let during = () => {};
+ const first = event => { trace.push('first'); during(event); };
+ const last = () => trace.push('last');
+ const capture = () => trace.push('capture');
+ const handler = () => { trace.push('handler'); return false; };
+ target.addEventListener(type, first);
+ target[property] = handler;
+ target.addEventListener(type, last);
+ target.addEventListener(type, capture, true);
+ check(fire(), false, 'handler cancellation');
+ check(trace.splice(0), ['capture', 'first', 'handler', 'last'], 'capture and registration order');
+
+ during = () => { target[property] = () => trace.push('replacement'); };
+ check(fire(), true, 'replacement cancellation');
+ check(trace.splice(0), ['capture', 'first', 'replacement', 'last'], 'replacement during dispatch');
+
+ during = () => { target[property] = null; target[property] = handler; };
+ fire();
+ check(trace.splice(0), ['capture', 'first', 'last'], 'removed entry stays inactive in snapshot');
+ during = () => {};
+ fire();
+ check(trace.splice(0), ['capture', 'first', 'last', 'handler'], 'reactivation appends');
+
+ during = event => event.stopImmediatePropagation();
+ fire();
+ check(trace.splice(0), ['capture', 'first'], 'earlier listener stops handler');
+ during = () => {};
+ target[property] = null;
+ target.removeEventListener(type, last);
+ target[property] = event => { trace.push('handler'); event.stopImmediatePropagation(); };
+ target.addEventListener(type, last);
+ fire();
+ check(trace.splice(0), ['capture', 'first', 'handler'], 'handler stops later listener');
+
+ target[property] = handler;
+ during = event => event.stopPropagation();
+ fire();
+ check(trace.splice(0), ['capture', 'first', 'handler', 'last'], 'stopPropagation keeps same phase');
+ during = () => {};
+
+ // Dispatch uses the registered handler even when script shadows its IDL
+ // accessor, and never reads arbitrary on-prefixed properties.
+ let reads = 0;
+ const ownDescriptor = Object.getOwnPropertyDescriptor(target, property);
+ Object.defineProperty(target, property, {configurable: true, get() { reads++; throw new Error('handler getter read'); }});
+ fire();
+ check(trace.splice(0), ['capture', 'first', 'handler', 'last'], 'shadowed accessor retains listener');
+ check(reads, 0, 'no property lookup during dispatch');
+ delete target[property];
+ if (ownDescriptor) Object.defineProperty(target, property, ownDescriptor);
+ target[property] = null;
+ for (const callback of [first, last]) target.removeEventListener(type, callback);
+ target.removeEventListener(type, capture, true);
+}
+
+function checkUnregisteredHandler(target, realm = globalThis) {
+ let calls = 0;
+ target.onunregistered = () => calls++;
+ target.dispatchEvent(new realm.Event('unregistered'));
+ if (calls !== 0) throw new Error('ordinary on-prefixed property was invoked');
+ Object.defineProperty(target, 'onunregistered', {configurable: true, get() { throw new Error('ordinary on-prefixed getter was read'); }});
+ target.dispatchEvent(new realm.Event('unregistered'));
+ delete target.onunregistered;
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.rs
new file mode 100644
index 000000000..0b925fad6
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_event_target_handlers.rs
@@ -0,0 +1,147 @@
+use super::*;
+
+const PROBE: &str = include_str!("simple_event_target_handlers.js");
+
+#[test]
+fn indexed_db_handlers_share_synthetic_and_native_listener_order() {
+ let mut vm = new_storage_page_task_executor_test_vm("https://idb-handler-order.test/");
+ vm.exec(PROBE, None).unwrap();
+ vm.eval(
+ r#"(() => {
+ const trace = [];
+ globalThis.__idbHandlerOrder = 'pending';
+ const open = indexedDB.open('handler-order', 1);
+ for (const type of ['success', 'error', 'blocked', 'upgradeneeded']) {
+ checkHandlerDispatch(open, type);
+ }
+ checkUnregisteredHandler(open);
+ open.onupgradeneeded = () => open.result.createObjectStore('values');
+ open.addEventListener('success', () => trace.push('open-before'));
+ open.onsuccess = () => {
+ trace.push('open-handler');
+ const db = open.result;
+ const tx = db.transaction('values');
+ const request = tx.objectStore('values').get('missing');
+ for (const [target, types] of [
+ [db, ['abort', 'close', 'error', 'versionchange']],
+ [tx, ['abort', 'complete', 'error']],
+ [request, ['success', 'error']],
+ ]) {
+ for (const type of types) checkHandlerDispatch(target, type);
+ checkUnregisteredHandler(target);
+ }
+ request.addEventListener('success', () => trace.push('request-before'));
+ request.onsuccess = () => trace.push('request-handler');
+ request.addEventListener('success', () => trace.push('request-after'));
+ tx.addEventListener('complete', () => trace.push('tx-before'));
+ tx.oncomplete = () => trace.push('tx-handler');
+ tx.addEventListener('complete', () => {
+ trace.push('tx-after');
+ globalThis.__idbHandlerOrder = JSON.stringify(trace);
+ db.close();
+ });
+ };
+ open.addEventListener('success', () => trace.push('open-after'));
+ return 'scheduled';
+ })()"#,
+ )
+ .unwrap();
+ assert_eq!(
+ vm.eval_after_selected_page_tasks("String(__idbHandlerOrder)")
+ .unwrap(),
+ r#"["open-before","open-handler","open-after","request-before","request-handler","request-after","tx-before","tx-handler","tx-after"]"#
+ );
+}
+
+#[test]
+fn xhr_native_dispatch_uses_registered_handlers_without_property_reads() {
+ let mut vm = new_storage_test_vm("https://xhr-handler-order.test/");
+ assert_eq!(
+ vm.eval(
+ r#"(() => {
+ const xhr = new XMLHttpRequest();
+ const trace = [];
+ xhr.addEventListener('readystatechange', () => trace.push('before'));
+ xhr.onreadystatechange = () => trace.push('handler');
+ xhr.addEventListener('readystatechange', () => trace.push('after'));
+ Object.defineProperty(xhr, 'onreadystatechange', {
+ get() { throw new Error('native dispatch read handler property'); }
+ });
+ xhr.open('GET', '/resource');
+ return JSON.stringify(trace);
+ })()"#,
+ )
+ .unwrap(),
+ r#"["before","handler","after"]"#
+ );
+}
+
+#[test]
+fn simple_window_handlers_share_dispatch_and_mutation_semantics() {
+ let mut vm = new_storage_test_vm("https://simple-window-handlers.test/");
+ vm.exec(PROBE, None).unwrap();
+ assert_eq!(
+ vm.eval(
+ r#"(() => {
+ const popup = open();
+ const doc = document.implementation.createHTMLDocument('');
+ const frame = doc.createElement('iframe');
+ doc.body.appendChild(frame);
+ try {
+ for (const target of [popup, frame.contentWindow]) {
+ checkHandlerDispatch(target, 'message');
+ checkUnregisteredHandler(target);
+ }
+ return true;
+ } finally { popup.close(); }
+ })()"#,
+ )
+ .unwrap(),
+ "true"
+ );
+}
+
+#[test]
+fn simple_event_target_handlers_share_dispatch_and_mutation_semantics() {
+ let mut vm = new_parsed_test_vm(
+ "https://simple-event-target-handlers.test/",
+ "<body><iframe id=child></iframe></body>",
+ );
+ vm.exec(PROBE, None).unwrap();
+ assert_eq!(
+ vm.eval(
+ r#"(() => {
+ for (const w of [window, document.getElementById('child').contentWindow]) {
+ const video = w.document.createElement('video');
+ const track = video.addTextTrack('subtitles');
+ const reader = new w.FileReader();
+ const notification = new w.Notification('handlers');
+ const targets = [
+ [w.performance, 'resourcetimingbufferfull'],
+ [w.screen.orientation, 'change'],
+ [new w.VTTCue(0, 1, ''), 'enter'],
+ [new w.VTTCue(0, 1, ''), 'exit'],
+ [track, 'cuechange'],
+ [video.textTracks, 'addtrack'],
+ [video.textTracks, 'removetrack'],
+ [new w.IdleDetector(), 'change'],
+ [new w.OfflineAudioContext(1, 8, 8000), 'complete'],
+ [w.visualViewport, 'resize'],
+ [w.visualViewport, 'scroll'],
+ [w.visualViewport, 'scrollend'],
+ ...['loadstart', 'progress', 'load', 'loadend', 'error', 'abort'].map(type => [reader, type]),
+ ...['click', 'show', 'error', 'close'].map(type => [notification, type]),
+ ];
+ for (const [target, type] of targets) {
+ checkHandlerDispatch(target, type, w);
+ checkUnregisteredHandler(target, w);
+ }
+ checkUnregisteredHandler(new w.EventTarget(), w);
+ }
+ return true;
+ })()"#,
+ )
+ .unwrap(),
+ "true"
+ );
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_handler_object.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_handler_object.rs
index 093ab160f..e439867e4 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/simple_handler_object.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/simple_handler_object.rs
@@ -105,6 +105,17 @@ __EXERCISE__
case 'synthesis': target = w.speechSynthesis; type = 'voiceschanged'; break;
case 'devices': target = w.navigator.mediaDevices; type = 'devicechange'; break;
case 'service-container': target = w.navigator.serviceWorker; type = 'message'; break;
+ case 'orientation': target = w.screen.orientation; type = 'change'; break;
+ case 'cue-enter': target = new w.VTTCue(0, 1, ''); type = 'enter'; break;
+ case 'cue-exit': target = new w.VTTCue(0, 1, ''); type = 'exit'; break;
+ case 'text-track': target = w.document.createElement('video').addTextTrack('subtitles'); type = 'cuechange'; break;
+ case 'track-list-add': target = w.document.createElement('video').textTracks; type = 'addtrack'; break;
+ case 'track-list-remove': target = w.document.createElement('video').textTracks; type = 'removetrack'; break;
+ case 'file-reader': target = new w.FileReader(); type = 'load'; break;
+ case 'idle': target = new w.IdleDetector(); type = 'change'; break;
+ case 'offline-audio': target = new w.OfflineAudioContext(1, 8, 8000); type = 'complete'; break;
+ case 'viewport': target = w.visualViewport; type = 'resize'; break;
+ case 'notification': target = new w.Notification('handlers'); type = 'click'; break;
case 'event-source': target = new w.EventSource('/event-source'); type = 'open'; cleanup = () => target.close(); break;
case 'websocket': target = new w.WebSocket((location.protocol === 'https:' ? 'wss://' : 'ws://') + location.host + '/socket'); type = 'open'; cleanup = () => target.close(); break;
case 'worker-host': {
@@ -199,12 +210,32 @@ async fn simple_handler_object_values_preserve_identity_and_listener_position()
"websocket",
"worker-host",
"shared-worker-host",
+ "orientation",
+ "cue-enter",
+ "cue-exit",
+ "text-track",
+ "track-list-add",
+ "track-list-remove",
+ "file-reader",
+ "idle",
+ "offline-audio",
+ "viewport",
+ "notification",
"child-xhr",
"child-xhr-upload",
"child-performance",
"child-fonts",
"child-broadcast",
"child-speech",
+ "child-orientation",
+ "child-cue-enter",
+ "child-text-track",
+ "child-track-list-add",
+ "child-file-reader",
+ "child-idle",
+ "child-offline-audio",
+ "child-viewport",
+ "child-notification",
] {
// Child/error callback exception routing is independent of handler conversion.
let check_exception = !kind.starts_with("child-") && kind != "shared-worker-host";
diff --git a/moli-renderer-v8/src/worker/global_scope/bootstrap.rs b/moli-renderer-v8/src/worker/global_scope/bootstrap.rs
index c8fb77b44..27a4f68c5 100644
--- a/moli-renderer-v8/src/worker/global_scope/bootstrap.rs
+++ b/moli-renderer-v8/src/worker/global_scope/bootstrap.rs
@@ -204,8 +204,8 @@ pub(in crate::worker) fn install_worker_global_scope<'s>(
)?;
crate::context_bootstrap::install_worker_indexed_db_runtime_state(scope, global)?;
crate::context_bootstrap::install_worker_base64_runtime_state(scope, global)?;
- install_simple_event_target_methods(scope, global, WORKER_GLOBAL_LISTENERS_SLOT, false);
- install_simple_event_target_ordered_handlers(scope, global);
+ install_simple_event_target_methods(scope, global, WORKER_GLOBAL_LISTENERS_SLOT);
+
let script_url = state.borrow().current_script_url.clone();
let origin = script_url
.as_ref()
diff --git a/moli-renderer-v8/src/worker/global_scope/event_handlers.rs b/moli-renderer-v8/src/worker/global_scope/event_handlers.rs
index 7d32fac56..23c87d58f 100644
--- a/moli-renderer-v8/src/worker/global_scope/event_handlers.rs
+++ b/moli-renderer-v8/src/worker/global_scope/event_handlers.rs
@@ -264,25 +264,16 @@ fn set_worker_global_event_handler<'s>(
global: v8::Local<'s, v8::Object>,
value: v8::Local<'s, v8::Value>,
slot_name: &'static str,
- event_type: Option<&str>,
+ event_type: &str,
) {
- let stored = if value.is_object() {
- value
- } else {
- v8::null(scope).into()
- };
- let active = stored.is_object();
- set_private_value(scope, global, slot_name, stored);
- if let Some(event_type) = event_type {
- simple_object_event_set_ordered_handler(
- scope,
- global,
- WORKER_GLOBAL_LISTENERS_SLOT,
- event_type,
- slot_name,
- active,
- );
- }
+ simple_object_event_set_handler(
+ scope,
+ global,
+ WORKER_GLOBAL_LISTENERS_SLOT,
+ event_type,
+ slot_name,
+ value,
+ );
}
fn worker_global_onmessage_getter<'s>(
@@ -307,7 +298,7 @@ fn worker_global_onmessage_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONMESSAGE_SLOT,
- Some("message"),
+ "message",
);
}
@@ -333,7 +324,7 @@ fn worker_global_onmessageerror_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONMESSAGEERROR_SLOT,
- Some("messageerror"),
+ "messageerror",
);
}
@@ -359,7 +350,7 @@ fn worker_global_oninstall_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONINSTALL_SLOT,
- Some("install"),
+ "install",
);
}
@@ -385,7 +376,7 @@ fn worker_global_onactivate_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONACTIVATE_SLOT,
- Some("activate"),
+ "activate",
);
}
@@ -411,7 +402,7 @@ fn worker_global_onfetch_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONFETCH_SLOT,
- Some("fetch"),
+ "fetch",
);
}
@@ -437,7 +428,7 @@ fn worker_global_onpush_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONPUSH_SLOT,
- Some("push"),
+ "push",
);
}
@@ -463,7 +454,7 @@ fn worker_global_onsync_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONSYNC_SLOT,
- Some("sync"),
+ "sync",
);
}
@@ -489,7 +480,7 @@ fn worker_global_onperiodicsync_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONPERIODICSYNC_SLOT,
- Some("periodicsync"),
+ "periodicsync",
);
}
@@ -515,7 +506,7 @@ fn worker_global_onnotificationclick_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONNOTIFICATIONCLICK_SLOT,
- Some("notificationclick"),
+ "notificationclick",
);
}
@@ -541,7 +532,7 @@ fn worker_global_onnotificationclose_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONNOTIFICATIONCLOSE_SLOT,
- Some("notificationclose"),
+ "notificationclose",
);
}
@@ -567,7 +558,7 @@ fn worker_global_onerror_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONERROR_SLOT,
- Some("error"),
+ "error",
);
}
@@ -593,7 +584,7 @@ fn worker_global_onconnect_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONCONNECT_SLOT,
- Some("connect"),
+ "connect",
);
}
@@ -619,7 +610,7 @@ fn worker_global_onoffline_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONOFFLINE_SLOT,
- Some("offline"),
+ "offline",
);
}
@@ -645,7 +636,7 @@ fn worker_global_ononline_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONONLINE_SLOT,
- Some("online"),
+ "online",
);
}
@@ -671,7 +662,7 @@ fn worker_global_onunhandledrejection_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONUNHANDLEDREJECTION_SLOT,
- Some("unhandledrejection"),
+ "unhandledrejection",
);
}
@@ -697,7 +688,7 @@ fn worker_global_onrejectionhandled_setter<'s>(
args.this(),
args.get(0),
WORKER_GLOBAL_ONREJECTIONHANDLED_SLOT,
- Some("rejectionhandled"),
+ "rejectionhandled",
);
}
diff --git a/moli-renderer-v8/src/worker/global_scope/mod.rs b/moli-renderer-v8/src/worker/global_scope/mod.rs
index 0dec4f57b..f8b358183 100644
--- a/moli-renderer-v8/src/worker/global_scope/mod.rs
+++ b/moli-renderer-v8/src/worker/global_scope/mod.rs
@@ -52,8 +52,7 @@ use super::{
use crate::context_bootstrap::WebCryptoTaskResult;
use crate::context_bootstrap::{
WebCryptoRejection, install_simple_event_target_methods,
- install_simple_event_target_ordered_handlers, simple_object_event_listeners_snapshot,
- simple_object_event_set_ordered_handler,
+ simple_object_event_listeners_snapshot, simple_object_event_set_handler,
};
use crate::network::loads::{ResourceLoadDisposition, ResourceLoadKind, ResourceLoadLease};
use crate::network_host::xhr_has_upload_listeners;
diff --git a/moli-renderer-v8/src/worker/global_scope/service_worker_api.rs b/moli-renderer-v8/src/worker/global_scope/service_worker_api.rs
index d9f27e404..12ac794db 100644
--- a/moli-renderer-v8/src/worker/global_scope/service_worker_api.rs
+++ b/moli-renderer-v8/src/worker/global_scope/service_worker_api.rs
@@ -1,4 +1,7 @@
use super::*;
+use crate::context_bootstrap::{
+ simple_event_target_handler_getter_callback, simple_event_target_handler_setter_callback,
+};
pub(super) fn install_service_worker_global_runtime<'s>(
scope: &mut v8::PinScope<'s, '_>,
@@ -177,6 +180,8 @@ pub(in crate::worker) fn build_service_worker_global_service_worker<'s>(
) -> Result<v8::Local<'s, v8::Object>> {
ensure_worker_interface_constructor(scope, "ServiceWorker")?;
let worker = ServiceWorkerGlobalServiceWorkerDeclaration {
+ onstatechange: (),
+ onerror: (),
script_url: version.script_url().as_str().to_owned(),
state: version.state().to_owned(),
post_message: (),
@@ -190,7 +195,7 @@ pub(in crate::worker) fn build_service_worker_global_service_worker<'s>(
SERVICE_WORKER_VERSION_ID_SLOT,
version_id_value.into(),
);
- install_simple_event_target_methods(scope, worker, SERVICE_WORKER_WORKER_EVENTS_SLOT, false);
+ install_simple_event_target_methods(scope, worker, SERVICE_WORKER_WORKER_EVENTS_SLOT);
Ok(worker)
}
@@ -1930,6 +1935,27 @@ struct ServiceWorkerGlobalRegistrationDeclaration<'scope> {
#[derive(WebApiObject)]
#[webapi(interface = web_api_interfaces::ServiceWorker,)]
struct ServiceWorkerGlobalServiceWorkerDeclaration {
+ #[webapi(
+ accessor_property = "onstatechange",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onstatechange"),
+ setter_data = v8str(scope, "onstatechange"),
+ enumerable,
+ receiver = web_api_interfaces::ServiceWorker::is_instance
+ )]
+ onstatechange: (),
+ #[webapi(
+ accessor_property = "onerror",
+ getter = simple_event_target_handler_getter_callback,
+ setter = simple_event_target_handler_setter_callback,
+ data = v8str(scope, "onerror"),
+ setter_data = v8str(scope, "onerror"),
+ enumerable,
+ receiver = web_api_interfaces::ServiceWorker::is_instance
+ )]
+ onerror: (),
+
#[webapi(data_property = "scriptURL", readonly)]
script_url: String,
diff --git a/moli-renderer-v8/src/worker/thread/tests/performance_handler_order.rs b/moli-renderer-v8/src/worker/thread/tests/performance_handler_order.rs
index 37e544e29..0eb93843e 100644
--- a/moli-renderer-v8/src/worker/thread/tests/performance_handler_order.rs
+++ b/moli-renderer-v8/src/worker/thread/tests/performance_handler_order.rs
@@ -1,5 +1,39 @@
use super::*;
+#[tokio::test]
+async fn worker_simple_event_handlers_share_dispatch_and_mutation_semantics() {
+ ensure_v8();
+ let probe =
+ include_str!("../../../script_vm/tests/browser_api/simple_event_target_handlers.js");
+ for kind in [WorkerScriptKind::Classic, WorkerScriptKind::Module] {
+ let source = format!(
+ r#"{probe}
+ const targets = [
+ [self, 'message'], [self, 'online'],
+ [performance, 'resourcetimingbufferfull'],
+ [new AbortController().signal, 'abort'],
+ ...['loadstart', 'progress', 'load', 'loadend', 'error', 'abort'].map(type => [new FileReader(), type]),
+ ...['click', 'show', 'error', 'close'].map(type => [new Notification('handlers'), type]),
+ ];
+ for (const [target, type] of targets) {{
+ checkHandlerDispatch(target, type);
+ checkUnregisteredHandler(target);
+ }}
+ checkUnregisteredHandler(new EventTarget());
+ postMessage(true);
+ close();"#
+ );
+ let mut handle = spawn_test_worker_with_options(
+ WorkerSpawnOptions::new(
+ source,
+ "https://simple-event-target-handlers.test/worker.js".to_owned(),
+ )
+ .with_script_kind(kind),
+ );
+ assert_eq!(recv_post_json(&mut handle).await, "true");
+ }
+}
+
#[tokio::test]
async fn worker_performance_handlers_keep_their_listener_position_across_replacement() {
ensure_v8();
diff --git a/moli-wpt-compat/fixtures/wpt/ported/indexeddb/idb-event-target-basic.html b/moli-wpt-compat/fixtures/wpt/ported/indexeddb/idb-event-target-basic.html
index 60353c4cb..afef02d7a 100644
--- a/moli-wpt-compat/fixtures/wpt/ported/indexeddb/idb-event-target-basic.html
+++ b/moli-wpt-compat/fixtures/wpt/ported/indexeddb/idb-event-target-basic.html
@@ -76,15 +76,28 @@ promise_test(async () => {
"dispatchEvent event is required"
);
- request.addEventListener("success");
- request.removeEventListener("success");
+ assert_throws_name(
+ "TypeError",
+ () => request.addEventListener("success"),
+ "addEventListener callback is required"
+ );
+ assert_throws_name(
+ "TypeError",
+ () => request.removeEventListener("success"),
+ "removeEventListener callback is required"
+ );
request.addEventListener("success", null);
request.removeEventListener("success", null);
request.addEventListener(undefined, listener);
request.removeEventListener(undefined, listener);
request.addEventListener("manual", () => events.push("manual"));
+ assert_throws_name(
+ "TypeError",
+ () => request.dispatchEvent({ type: "manual" }),
+ "dispatchEvent requires a branded Event"
+ );
assert_true(
- request.dispatchEvent({ type: "manual" }),
+ request.dispatchEvent(new Event("manual")),
"dispatchEvent returns true for a non-canceled event object"
);
request.addEventListener("success", listener);