Skip to content

armgit / moli

Public Imported from GitHub
0

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

fix(cssom): share EventTarget bindings for MediaQueryList

ldm006018f49832e
diff --git a/moli-renderer-v8/src/context_bootstrap/event_target_dispatch.rs b/moli-renderer-v8/src/context_bootstrap/event_target_dispatch.rs
index 7f1e33500..dde113809 100644
--- a/moli-renderer-v8/src/context_bootstrap/event_target_dispatch.rs
+++ b/moli-renderer-v8/src/context_bootstrap/event_target_dispatch.rs
@@ -8,7 +8,6 @@ use crate::util::{throw_type_error, v8str};
pub(crate) fn prepare_script_dispatch<'s>(
scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
value: v8::Local<'s, v8::Value>,
) -> Option<(v8::Local<'s, v8::Object>, String)> {
let event = v8::Local::<v8::Object>::try_from(value).ok();
@@ -27,9 +26,8 @@ pub(crate) fn prepare_script_dispatch<'s>(
scope.throw_exception(error);
return None;
}
- if !target_execution_context_is_live(scope, target) {
- return None;
- }
+ // Retaining a target keeps synthetic dispatch available. Each listener's
+ // relevant realm is checked separately by CallbackInvoker before invocation.
set_event_trusted(scope, event, false);
let event_type = event
.get(scope, v8str(scope, "type").into())?
@@ -38,29 +36,6 @@ pub(crate) fn prepare_script_dispatch<'s>(
Some((event, event_type))
}
-pub(crate) fn target_execution_context_is_live<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- target: v8::Local<'s, v8::Object>,
-) -> bool {
- let Some(context) = target.get_creation_context(scope) else {
- return true;
- };
- if context
- .get_slot::<crate::native_bridge::RuntimeObservableContextToken>()
- .is_none()
- {
- return true;
- }
- let Some(host_ptr) = crate::util::context_host_ptr_from_global_bridge(scope) else {
- return true;
- };
- // A borrowed method still dispatches on the receiver's relevant realm.
- // Retained objects must not resume execution after that realm is retired.
- let host = unsafe { &*host_ptr };
- host.window_execution_context_identity_for_v8_context(scope, context)
- .is_some_and(|identity| host.window_execution_context_identity_is_current(identity))
-}
-
// Even a pre-stopped event needs finish_dispatch, but its listeners must not run.
pub(crate) fn begin_dispatch<'s>(
scope: &mut v8::PinScope<'s, '_>,
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries.rs b/moli-renderer-v8/src/context_bootstrap/media_queries.rs
index a6657c437..b14296b87 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries.rs
@@ -22,13 +22,11 @@ pub(crate) use self::events::{
simple_object_event_target_remove_listener,
};
pub(super) use self::events::{
- media_query_list_add_event_listener_callback, media_query_list_add_listener_callback,
- media_query_list_dispatch_event_callback, media_query_list_remove_event_listener_callback,
- media_query_list_remove_listener_callback,
+ media_query_list_add_listener_callback, media_query_list_remove_listener_callback,
};
use super::{
MEDIA_QUERY_LIST_LISTENERS_SLOT, SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT,
SIMPLE_EVENT_TARGET_SLOT, object_bool_property, object_property_as_array,
- object_string_property_defined, throw_type_error, v8_string, v8str,
+ object_string_property_defined, v8_string, 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 106f04353..8a665d3d6 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/evaluation.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/evaluation.rs
@@ -1,10 +1,13 @@
-use super::dispatch_media_query_list_event;
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,
+};
use crate::context_bootstrap::DEFAULT_WINDOW_SURFACE_PROFILE;
use crate::context_bootstrap::current_window_style_viewport;
use crate::context_bootstrap::{
- MEDIA_QUERY_LIST_MATCHES_SLOT, MEDIA_QUERY_LIST_MEDIA_SLOT, MEDIA_QUERY_LIST_ONCHANGE_SLOT,
- MEDIA_QUERY_LIST_REGISTRY_SLOT,
+ MEDIA_QUERY_LIST_LISTENERS_SLOT, MEDIA_QUERY_LIST_MATCHES_SLOT, MEDIA_QUERY_LIST_MEDIA_SLOT,
+ MEDIA_QUERY_LIST_ONCHANGE_SLOT, MEDIA_QUERY_LIST_REGISTRY_SLOT,
};
use crate::context_bootstrap::{global_queue_array, push_object_to_global_registry};
use crate::style_engine::{
@@ -31,7 +34,7 @@ struct MediaQueryListObjectDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::MediaQueryList)]
+#[webapi(interface = web_api_interfaces::MediaQueryList, receiver)]
struct MediaQueryListPrototypeAccessorsDeclaration {
#[webapi(
accessor_property,
@@ -86,6 +89,11 @@ fn media_query_list_attribute_getter_callback<'s>(
return;
};
if slot == MEDIA_QUERY_LIST_MATCHES_SLOT {
+ let context = args
+ .this()
+ .get_creation_context(scope)
+ .unwrap_or_else(|| scope.get_current_context());
+ let scope = &mut v8::ContextScope::new(scope, context);
let media = media_query_list_media_slot(scope, args.this()).unwrap_or_default();
let matches = if let Some(host_ptr) = context_host_ptr_from_global_bridge(scope) {
let host = unsafe { &*host_ptr };
@@ -128,12 +136,22 @@ fn media_query_list_onchange_setter_callback<'s>(
args: v8::FunctionCallbackArguments<'s>,
mut rv: v8::ReturnValue<'_, v8::Value>,
) {
- let value = if args.get(0).is_null_or_undefined() {
- v8::null(scope).into()
- } else {
+ let active = args.get(0).is_object();
+ let value = if active {
args.get(0)
+ } else {
+ v8::null(scope).into()
};
- set_media_query_list_slot_value(scope, args.this(), MEDIA_QUERY_LIST_ONCHANGE_SLOT, value);
+ let target = args.this();
+ set_media_query_list_slot_value(scope, target, MEDIA_QUERY_LIST_ONCHANGE_SLOT, value);
+ simple_object_event_set_ordered_handler(
+ scope,
+ target,
+ MEDIA_QUERY_LIST_LISTENERS_SLOT,
+ "change",
+ MEDIA_QUERY_LIST_ONCHANGE_SLOT,
+ active,
+ );
rv.set_undefined();
}
@@ -164,6 +182,8 @@ pub(crate) fn window_match_media_callback<'s>(
let mql = MediaQueryListObjectDeclaration::new(serialized_query, matches)
.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 667c232ff..13533417d 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,7 @@
use super::{
MEDIA_QUERY_LIST_LISTENERS_SLOT, SIMPLE_EVENT_TARGET_ORDERED_HANDLERS_SLOT,
SIMPLE_EVENT_TARGET_SLOT, object_bool_property, object_property_as_array,
- object_string_property_defined, throw_type_error, v8_string, v8str,
+ object_string_property_defined, v8_string, v8str,
};
const SIMPLE_EVENT_TARGET_HANDLER_SLOT_FIELD: &str = "handlerSlot";
@@ -9,9 +9,8 @@ mod media_query_list;
mod simple_event_target;
pub(in crate::context_bootstrap) use media_query_list::{
- dispatch_media_query_list_event, media_query_list_add_event_listener_callback,
- media_query_list_add_listener_callback, media_query_list_dispatch_event_callback,
- media_query_list_remove_event_listener_callback, media_query_list_remove_listener_callback,
+ dispatch_media_query_list_event, media_query_list_add_listener_callback,
+ media_query_list_remove_listener_callback,
};
pub(crate) use simple_event_target::{
SimpleObjectEventListenerInspectorSnapshot, SimpleObjectEventListenerSnapshot,
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list.rs
index 22e2df78d..7587210af 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list.rs
@@ -4,9 +4,6 @@ mod callbacks;
mod dispatch;
pub(in crate::context_bootstrap) use callbacks::{
- media_query_list_add_event_listener_callback, media_query_list_add_listener_callback,
- media_query_list_remove_event_listener_callback, media_query_list_remove_listener_callback,
-};
-pub(in crate::context_bootstrap) use dispatch::{
- dispatch_media_query_list_event, media_query_list_dispatch_event_callback,
+ media_query_list_add_listener_callback, media_query_list_remove_listener_callback,
};
+pub(in crate::context_bootstrap) use dispatch::dispatch_media_query_list_event;
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list/callbacks.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list/callbacks.rs
index 6a46645c4..ff20104ef 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list/callbacks.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list/callbacks.rs
@@ -1,22 +1,6 @@
use super::*;
use crate::webidl;
-pub(in crate::context_bootstrap) fn media_query_list_add_event_listener_callback<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- args: v8::FunctionCallbackArguments<'s>,
- _rv: v8::ReturnValue<'s, v8::Value>,
-) {
- simple_object_event_target_add_listener(scope, &args, MEDIA_QUERY_LIST_LISTENERS_SLOT);
-}
-
-pub(in crate::context_bootstrap) fn media_query_list_remove_event_listener_callback<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- args: v8::FunctionCallbackArguments<'s>,
- _rv: v8::ReturnValue<'s, v8::Value>,
-) {
- simple_object_event_target_remove_listener(scope, &args, MEDIA_QUERY_LIST_LISTENERS_SLOT);
-}
-
#[derive(webidl::WebIdlArgs)]
#[webidl(prefix = "MediaQueryList.addListener")]
struct MediaQueryListAddListenerArgs {
diff --git a/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list/dispatch.rs b/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list/dispatch.rs
index 2fc88dde7..ce9928336 100644
--- a/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list/dispatch.rs
+++ b/moli-renderer-v8/src/context_bootstrap/media_queries/events/media_query_list/dispatch.rs
@@ -16,35 +16,3 @@ pub(in crate::context_bootstrap) fn dispatch_media_query_list_event<'s>(
event,
)
}
-
-pub(crate) fn media_query_list_dispatch_event_callback<'s>(
- scope: &mut v8::PinScope<'s, '_>,
- args: v8::FunctionCallbackArguments<'s>,
- mut rv: v8::ReturnValue<'s, v8::Value>,
-) {
- let event_value = args.get(0);
- if !event_value.is_object() || event_value.is_function() {
- throw_type_error(
- scope,
- "Failed to execute 'dispatchEvent': parameter 1 is not an object.",
- );
- return;
- }
- let Ok(event) = v8::Local::<v8::Object>::try_from(event_value) else {
- throw_type_error(
- scope,
- "Failed to execute 'dispatchEvent': parameter 1 is not an object.",
- );
- return;
- };
- if object_string_property_defined(scope, event, "type").is_none() {
- throw_type_error(
- scope,
- "Failed to execute 'dispatchEvent': event type is required.",
- );
- return;
- }
-
- let default_allowed = dispatch_media_query_list_event(scope, args.this(), event);
- rv.set(v8::Boolean::new(scope, default_allowed).into());
-}
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 87da25295..95acda01f 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
@@ -28,7 +28,6 @@ pub(in crate::context_bootstrap::media_queries::events::simple_event_target) fn
let Some((event, event_type)) =
crate::context_bootstrap::event_target_dispatch::prepare_script_dispatch(
scope,
- args.this(),
args.get(0),
)
else {
diff --git a/moli-renderer-v8/src/context_bootstrap/observer_template.rs b/moli-renderer-v8/src/context_bootstrap/observer_template.rs
index 019ca1b8a..c30045731 100644
--- a/moli-renderer-v8/src/context_bootstrap/observer_template.rs
+++ b/moli-renderer-v8/src/context_bootstrap/observer_template.rs
@@ -1,7 +1,5 @@
use super::media_queries::{
- media_query_list_add_event_listener_callback, media_query_list_add_listener_callback,
- media_query_list_dispatch_event_callback, media_query_list_remove_event_listener_callback,
- media_query_list_remove_listener_callback,
+ media_query_list_add_listener_callback, media_query_list_remove_listener_callback,
};
use super::performance_runtime::{
performance_entry_list_get_entries_by_name_callback,
@@ -71,21 +69,8 @@ struct IntersectionObserverTemplateMethodsDeclaration {
}
#[derive(WebApiFunctionTemplate)]
-#[webapi(interface = web_api_interfaces::MediaQueryList, enumerable)]
+#[webapi(interface = web_api_interfaces::MediaQueryList, enumerable, receiver)]
struct MediaQueryListTemplateMethodsDeclaration {
- #[webapi(method, length = 2, callback = media_query_list_add_event_listener_callback)]
- add_event_listener: (),
-
- #[webapi(
- method,
- length = 2,
- callback = media_query_list_remove_event_listener_callback
- )]
- remove_event_listener: (),
-
- #[webapi(method, length = 1, callback = media_query_list_dispatch_event_callback)]
- dispatch_event: (),
-
#[webapi(method, length = 1, callback = media_query_list_add_listener_callback)]
add_listener: (),
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.js b/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.js
index 73d3f60db..bb61f5266 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.js
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.js
@@ -175,18 +175,24 @@ function abortSignalLifetimeProbe() {
const signal = controller.signal;
const methods = [EventTarget.prototype.dispatchEvent, realm.EventTarget.prototype.dispatchEvent];
let calls = 0;
+ const retiredCalls = [];
+ const retiredCallback = realm.Function('calls', 'return function() { calls.push(true); };')(retiredCalls);
+ signal.addEventListener('x', retiredCallback);
signal.addEventListener('x', () => ++calls);
frame.remove();
for (const method of methods) {
const event = new Event('x');
try {
- if (method.call(signal, event) !== false || event.target !== null) failures.push('retired dispatch result');
+ if (method.call(signal, event) !== true || event.target !== signal) failures.push('retained dispatch result');
+ if (event.currentTarget !== null || event.eventPhase !== Event.NONE || event.isTrusted)
+ failures.push('retained dispatch cleanup');
} catch (error) { failures.push('retired dispatch: ' + error.name); }
for (const [value, expected] of [[null, 'TypeError'], [{}, 'TypeError'], [document.createEvent('Event'), 'InvalidStateError']]) {
try { method.call(signal, value); failures.push('accepted invalid event'); }
catch (error) { if (error.name !== expected) failures.push('wrong retired error: ' + error.name); }
}
}
- if (calls) failures.push('retired callback invoked');
+ if (calls !== 2) failures.push('live callback skipped');
+ if (retiredCalls.length) failures.push('retired callback invoked');
return {calls, failures};
}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.rs
index 94f8c63aa..7e9a26c48 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/abort_signal_events.rs
@@ -47,8 +47,8 @@ fn abort_signal_generated_receiver_checks_use_callee_realm_before_conversion() {
}
#[test]
-fn abort_signal_inherited_dispatch_preserves_retired_target_validation() {
+fn abort_signal_retained_target_dispatch_uses_callback_realm_lifetime() {
let result = run_probe("abortSignalLifetimeProbe()");
assert_eq!(result["failures"], serde_json::json!([]), "{result}");
- assert_eq!(result["calls"], 0);
+ assert_eq!(result["calls"], 2);
}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.js b/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.js
index 62a99dcb1..fb446a262 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.js
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.js
@@ -65,3 +65,184 @@ function mediaQueryListEventConstructorProbe() {
} finally { frame.remove(); }
return {checks, failures};
}
+
+function mediaQueryListEventTargetProbe() {
+ const failures = [];
+ const rows = [];
+ const check = (value, label) => { if (!value) failures.push(label); };
+ const frame = document.body.appendChild(document.createElement("iframe"));
+ try {
+ for (const [name, realm, methods] of [
+ ["main", window, frame.contentWindow.EventTarget.prototype],
+ ["child", frame.contentWindow, EventTarget.prototype],
+ ]) {
+ const target = realm.matchMedia("all");
+ const calls = [];
+ check(target instanceof realm.EventTarget, name + ":brand inheritance");
+ check(Object.getPrototypeOf(realm.MediaQueryList.prototype) === realm.EventTarget.prototype,
+ name + ":prototype inheritance");
+ for (const method of ["addEventListener", "removeEventListener", "dispatchEvent"]) {
+ check(!Object.hasOwn(realm.MediaQueryList.prototype, method), name + ":inherited " + method);
+ check(target[method] === realm.EventTarget.prototype[method], name + ":shared " + method);
+ }
+ const legacy = {handleEvent(event) {
+ check(this === legacy && event.target === target && event.currentTarget === target,
+ name + ":callback receiver");
+ check(event.eventPhase === Event.AT_TARGET && window.event === event,
+ name + ":callback dispatch state");
+ calls.push("legacy");
+ }};
+ target.addListener(legacy);
+ methods.addEventListener.call(target, "change", legacy, {once: true});
+ target.onchange = () => calls.push("old-handler");
+ methods.addEventListener.call(target, "change", () => calls.push("modern"));
+ target.onchange = () => { calls.push("handler"); return false; };
+ methods.addEventListener.call(target, "change", () => calls.push("capture"), true);
+ const event = new Event("change", {cancelable: true});
+ check(methods.dispatchEvent.call(target, event) === false, name + ":cancellation");
+ check(calls.join() === "capture,legacy,handler,modern", name + ":handler order " + calls);
+ check(event.currentTarget === null && event.eventPhase === 0 && event.target === target,
+ name + ":dispatch cleanup");
+ target.onchange = null;
+ target.onchange = () => calls.push("last-handler");
+ calls.length = 0;
+ target.dispatchEvent(new Event("change"));
+ check(calls.join() === "capture,legacy,modern,last-handler", name + ":handler re-add " + calls);
+ methods.removeEventListener.call(target, "change", legacy);
+ target.onchange = 12;
+ check(target.onchange === null, name + ":handler conversion");
+ calls.length = 0;
+ target.dispatchEvent(new Event("change"));
+ check(calls.join() === "capture,modern", name + ":legacy removal " + calls);
+ let once = 0;
+ const controller = new AbortController();
+ methods.addEventListener.call(target, "probe", () => ++once, {once: true});
+ methods.addEventListener.call(target, "probe", () => failures.push(name + ":aborted listener"),
+ {signal: controller.signal});
+ controller.abort();
+ target.dispatchEvent(new Event("probe"));
+ target.dispatchEvent(new Event("probe"));
+ check(once === 1, name + ":once");
+ rows.push(name);
+ }
+ } finally { frame.remove(); }
+ return {rows, failures};
+}
+
+function mediaQueryListReceiverProbe() {
+ const failures = [];
+ let checks = 0;
+ const frame = document.body.appendChild(document.createElement("iframe"));
+ try {
+ for (const [name, realm] of [["main", window], ["child", frame.contentWindow]]) {
+ const target = realm.matchMedia("all");
+ const revoked = Proxy.revocable(target, {});
+ revoked.revoke();
+ const invalid = [{}, Object.create(realm.MediaQueryList.prototype), Object.create(target),
+ new Proxy(target, {}), revoked.proxy];
+ let conversions = 0;
+ const type = {toString() { ++conversions; return "probe"; }};
+ const methods = realm.EventTarget.prototype;
+ const prototype = realm.MediaQueryList.prototype;
+ const operations = [
+ value => methods.addEventListener.call(value, type, () => {}),
+ value => methods.removeEventListener.call(value, type, () => {}),
+ value => methods.dispatchEvent.call(value, new Event("probe")),
+ value => prototype.addListener.call(value, () => {}),
+ value => prototype.removeListener.call(value, () => {}),
+ ...["media", "matches", "onchange"].map(property =>
+ value => Object.getOwnPropertyDescriptor(prototype, property).get.call(value)),
+ value => Object.getOwnPropertyDescriptor(prototype, "onchange").set.call(value, () => {}),
+ ];
+ for (const [index, operation] of operations.entries()) for (const value of invalid) {
+ ++checks;
+ try { operation(value); failures.push(name + ":accepted receiver " + index); }
+ catch (error) {
+ if (!(error instanceof realm.TypeError)) failures.push(name + ":wrong exception realm " + index);
+ }
+ }
+ if (conversions !== 0) failures.push(name + ":converted before receiver check");
+ let reads = 0;
+ const fake = {get type() { ++reads; return "probe"; }};
+ try { methods.dispatchEvent.call(target, fake); failures.push(name + ":accepted fake event"); }
+ catch (error) { if (!(error instanceof realm.TypeError)) failures.push(name + ":fake event error"); }
+ if (reads !== 0) failures.push(name + ":read unbranded event");
+ target.addEventListener("probe", event => {
+ try { methods.dispatchEvent.call(target, event); failures.push(name + ":redispatched active event"); }
+ catch (error) { if (error.name !== "InvalidStateError") failures.push(name + ":active event error"); }
+ });
+ target.dispatchEvent(new Event("probe"));
+ }
+ } finally { frame.remove(); }
+ return {checks, failures};
+}
+
+function retainedEventTargetLifetimeProbe(mediaQueryList) {
+ const failures = [];
+ const check = (value, message) => { if (!value) failures.push(message); };
+ const frame = document.createElement("iframe");
+ frame.width = "200";
+ document.body.appendChild(frame);
+ const realm = frame.contentWindow;
+ const target = mediaQueryList ? realm.matchMedia("(max-width: 200px)") : new realm.EventTarget();
+ if (mediaQueryList) {
+ const parentMatches = Object.getOwnPropertyDescriptor(MediaQueryList.prototype, "matches").get;
+ check(target.matches && parentMatches.call(target), "borrowed matches used caller viewport");
+ const childMatches = Object.getOwnPropertyDescriptor(realm.MediaQueryList.prototype, "matches").get;
+ check(!childMatches.call(matchMedia("(max-width: 200px)")), "child getter used child viewport for parent");
+ }
+ const calls = [];
+ const retiredCalls = [];
+ const retiredCallback = realm.Function("calls", "return function() { calls.push('retired'); };")(retiredCalls);
+ target.addEventListener("change", retiredCallback, true);
+ target.addEventListener("retired-only", retiredCallback);
+ const listener = function(event) {
+ calls.push("listener");
+ check(this === target && event.target === target && event.currentTarget === target,
+ "retained target dispatch receivers");
+ check(event.eventPhase === Event.AT_TARGET && window.event === event && !event.isTrusted,
+ "retained target dispatch state");
+ check(event.composedPath().length === 1 && event.composedPath()[0] === target,
+ "retained target dispatch path");
+ try { target.dispatchEvent(event); failures.push("redispatched active event"); }
+ catch (error) { check(error.name === "InvalidStateError", "active event validation"); }
+ event.preventDefault();
+ };
+ if (mediaQueryList) {
+ target.addListener(listener);
+ target.onchange = retiredCallback;
+ } else {
+ target.addEventListener("change", listener);
+ }
+ target.addEventListener("change", () => calls.push("modern"));
+ target.addEventListener("change", () => calls.push("once"), {once: true});
+ const dispatchers = [EventTarget.prototype.dispatchEvent, realm.EventTarget.prototype.dispatchEvent];
+ frame.remove();
+ let dispatches = 0;
+ for (const dispatch of dispatchers) {
+ const retiredOnly = new Event("retired-only");
+ check(dispatch.call(target, retiredOnly) === true && retiredOnly.target === target,
+ "dispatch with only retired callbacks");
+ for (const cancelable of [false, true]) {
+ const event = new Event("change", {cancelable});
+ const before = calls.length;
+ try {
+ check(dispatch.call(target, event) === !cancelable, "retained target cancellation result");
+ check(event.defaultPrevented === cancelable, "retained target canceled flag");
+ check(event.target === target && event.currentTarget === null && event.eventPhase === Event.NONE,
+ "retained target dispatch cleanup");
+ check(event.composedPath().length === 0 && !event.isTrusted, "retained target path cleanup");
+ check(calls.slice(before).join() === (dispatches ? "listener,modern" : "listener,modern,once"),
+ "retained target listener order and once");
+ ++dispatches;
+ } catch (error) { failures.push("retained dispatch: " + error.name); }
+ }
+ for (const [value, expected] of [[null, "TypeError"], [{}, "TypeError"],
+ [document.createEvent("Event"), "InvalidStateError"]]) {
+ try { dispatch.call(target, value); failures.push("retired target accepted invalid event"); }
+ catch (error) { if (error.name !== expected) failures.push("retired argument validation: " + error.name); }
+ }
+ }
+ check(retiredCalls.length === 0, "invoked a retired callback realm");
+ return {calls: calls.length, dispatches, retiredCalls: retiredCalls.length, failures};
+}
diff --git a/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.rs b/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.rs
index f10018a3e..384fbd494 100644
--- a/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.rs
+++ b/moli-renderer-v8/src/script_vm/tests/browser_api/media_query_list_events.rs
@@ -8,7 +8,7 @@ fn run_probe(function: &str) -> serde_json::Value {
"<!doctype html><body>",
);
let result = vm
- .eval(&format!("{PROBE}\nJSON.stringify({function}())"))
+ .eval(&format!("{PROBE}\nJSON.stringify(({function})())"))
.unwrap();
let result: serde_json::Value = serde_json::from_str(&result).unwrap();
assert_eq!(result["failures"], serde_json::json!([]), "{result}");
@@ -20,3 +20,31 @@ fn media_query_list_event_constructor_preserves_webidl_and_receiver_semantics()
let result = run_probe("mediaQueryListEventConstructorProbe");
assert!(result["checks"].as_u64().unwrap() >= 35);
}
+
+#[test]
+fn media_query_list_inherits_event_target_and_shares_ordered_listeners() {
+ let result = run_probe("mediaQueryListEventTargetProbe");
+ assert_eq!(result["rows"], serde_json::json!(["main", "child"]));
+}
+
+#[test]
+fn media_query_list_generated_receiver_checks_precede_conversion() {
+ let result = run_probe("mediaQueryListReceiverProbe");
+ assert_eq!(result["checks"], 90);
+}
+
+#[test]
+fn media_query_list_retained_target_dispatch_uses_callback_realm_lifetime() {
+ let result = run_probe("() => retainedEventTargetLifetimeProbe(true)");
+ assert_eq!(result["calls"], 9);
+ assert_eq!(result["dispatches"], 4);
+ assert_eq!(result["retiredCalls"], 0);
+}
+
+#[test]
+fn event_target_retained_target_dispatch_uses_callback_realm_lifetime() {
+ let result = run_probe("() => retainedEventTargetLifetimeProbe(false)");
+ assert_eq!(result["calls"], 9);
+ assert_eq!(result["dispatches"], 4);
+ assert_eq!(result["retiredCalls"], 0);
+}
diff --git a/moli-renderer-v8/src/web_api_interfaces.rs b/moli-renderer-v8/src/web_api_interfaces.rs
index e69624661..06b67a5db 100644
--- a/moli-renderer-v8/src/web_api_interfaces.rs
+++ b/moli-renderer-v8/src/web_api_interfaces.rs
@@ -280,7 +280,7 @@ interfaces! {
MediaDevices: EventTarget;
MediaError;
MediaList;
- MediaQueryList;
+ MediaQueryList: EventTarget;
MediaQueryListEvent: Event;
MediaSource: EventTarget;
MemoryInfo;
diff --git a/moli-wpt-compat/fixtures/wpt/ported/idl/mediaquerylist-idlharness.html b/moli-wpt-compat/fixtures/wpt/ported/idl/mediaquerylist-idlharness.html
index 0a2ccd88f..9ba2c9f28 100644
--- a/moli-wpt-compat/fixtures/wpt/ported/idl/mediaquerylist-idlharness.html
+++ b/moli-wpt-compat/fixtures/wpt/ported/idl/mediaquerylist-idlharness.html
@@ -17,13 +17,10 @@ function assert_throws_name(name, callback, description) {
}
idl_test([`
-interface MediaQueryList {
+interface MediaQueryList : EventTarget {
readonly attribute CSSOMString media;
readonly attribute boolean matches;
attribute EventHandler onchange;
- undefined addEventListener(DOMString type, any callback, optional any options);
- undefined removeEventListener(DOMString type, any callback, optional any options);
- boolean dispatchEvent(Event event);
undefined addListener(any callback);
undefined removeListener(any callback);
};
@@ -49,6 +46,12 @@ test(function () {
media.onchange = event => calls.push(["handler", event.type, event.target === media]);
assert_true(media instanceof MediaQueryList);
+ assert_true(media instanceof EventTarget);
+ assert_equals(Object.getPrototypeOf(MediaQueryList.prototype), EventTarget.prototype);
+ for (const method of ["addEventListener", "removeEventListener", "dispatchEvent"]) {
+ assert_false(Object.prototype.hasOwnProperty.call(MediaQueryList.prototype, method));
+ assert_equals(media[method], EventTarget.prototype[method]);
+ }
assert_equals(Object.prototype.toString.call(media), "[object MediaQueryList]");
assert_false(Object.prototype.hasOwnProperty.call(media, "media"));
assert_false(Object.prototype.hasOwnProperty.call(media, "matches"));