diff --git a/moli-renderer-v8/src/script_vm/tests/audio_channel_node_interfaces.rs b/moli-renderer-v8/src/script_vm/tests/audio_channel_node_interfaces.rs
index 05a48eab5f7..6f4977c9392 100644
--- a/moli-renderer-v8/src/script_vm/tests/audio_channel_node_interfaces.rs
+++ b/moli-renderer-v8/src/script_vm/tests/audio_channel_node_interfaces.rs
@@ -1,5 +1,46 @@
use super::*;
+#[test]
+fn audio_graph_derived_arguments_preserve_ports_and_late_conversion_errors() {
+ let mut vm = new_storage_page_task_executor_test_vm("https://audio-port-conversion.test/");
+ vm.eval("document.body.innerHTML=''")
+ .unwrap();
+ assert_eq!(vm.eval(r#"(() => {
+ const assert = (ok, message) => { if (!ok) throw Error(message); };
+ for (const realm of [window, document.querySelector('iframe').contentWindow]) {
+ const context = new realm.OfflineAudioContext(2, 16, 48000);
+ const source = context.createChannelSplitter(2);
+ const target = context.createChannelMerger(2);
+ source.connect(target, 0, 0);
+ source.connect(target, 1, 1);
+ const sentinel = {}, order = [];
+ let error;
+ try {
+ source.disconnect(target,
+ {valueOf() { order.push('output'); return 99; }},
+ {valueOf() { order.push('input'); throw sentinel; }});
+ } catch (caught) { error = caught; }
+ assert(error === sentinel && order.join() === 'output,input', 'late conversion precedes port checks');
+ source.disconnect(target, undefined, undefined);
+ try { source.disconnect(target, 0, 0); } catch (caught) { error = caught; }
+ assert(error instanceof realm.DOMException && error.name === 'InvalidAccessError', 'explicit undefined selects port zero');
+ source.disconnect(target, 1, 1);
+ error = undefined;
+ try { source.disconnect(target); } catch (caught) { error = caught; }
+ assert(error instanceof realm.DOMException && error.name === 'InvalidAccessError', 'conversion failure preserved the other route');
+ source.connect(target, 0, 1);
+ source.connect(target, 1, 0);
+ source.disconnect(target);
+ for (const [output, input] of [[0, 1], [1, 0]]) {
+ error = undefined;
+ try { source.disconnect(target, output, input); } catch (caught) { error = caught; }
+ assert(error instanceof realm.DOMException && error.name === 'InvalidAccessError', 'omitted ports remove all routes');
+ }
+ }
+ return true;
+ })()"#).unwrap(), "true");
+}
+
#[test]
fn audio_channel_nodes_use_native_interfaces_and_port_constraints() {
let mut vm = new_storage_page_task_executor_test_vm("https://audio-channel-nodes.test/");
diff --git a/moli-renderer-v8/src/script_vm/tests/svg_filter_interfaces.rs b/moli-renderer-v8/src/script_vm/tests/svg_filter_interfaces.rs
index e841b38cd8c..b695ef85fbb 100644
--- a/moli-renderer-v8/src/script_vm/tests/svg_filter_interfaces.rs
+++ b/moli-renderer-v8/src/script_vm/tests/svg_filter_interfaces.rs
@@ -16,89 +16,6 @@ fn svg_filter_property_getters_and_windowless_writeback_use_native_receivers() {
);
}
-#[test]
-fn svg_filter_and_marker_getters_validate_native_receivers() {
- let mut vm =
- new_storage_page_task_executor_test_vm("https://svg-filter-marker-receivers.test/");
- vm.eval("document.body.innerHTML = ''")
- .unwrap();
- vm.eval(include_str!("svg_filter_marker_receivers.js"))
- .unwrap();
- assert_eq!(vm.eval("__uiEventResults.complete").unwrap(), "true");
- assert_eq!(vm.eval("__uiEventResults.total").unwrap(), "1872");
- assert_eq!(
- vm.eval("JSON.stringify(__uiEventResults.checks.filter(row => !row.passed))")
- .unwrap(),
- "[]"
- );
-}
-
-#[test]
-fn svg_filter_and_marker_getters_accept_registered_native_proxies() {
- let mut vm = new_storage_page_task_executor_test_vm("https://svg-filter-marker-proxies.test/");
- vm.eval(
- r#"
- document.body.innerHTML = '';
- globalThis.childWindow = document.querySelector('iframe').contentWindow;
- globalThis.foreignFilter = childWindow.document.createElementNS('http://www.w3.org/2000/svg', 'filter');
- globalThis.foreignMarker = childWindow.document.createElementNS('http://www.w3.org/2000/svg', 'marker');
- "#,
- )
- .unwrap();
- let context_ptr = &vm.current_main_world().unwrap().context as *const _;
- vm.with_context_scope_by_ptr_and_checkpoint_for_test(context_ptr, |scope, _| {
- let global = scope.get_current_context().global(scope);
- for (name, proxy_name) in [
- ("foreignFilter", "nativeFilterProxy"),
- ("foreignMarker", "nativeMarkerProxy"),
- ] {
- let key = crate::util::v8str(scope, name);
- let object = global.get(scope, key.into()).unwrap();
- let object = v8::Local::::try_from(object).unwrap();
- let handler = crate::util::new_null_prototype_object(scope);
- let proxy = v8::Proxy::new(scope, object, handler).unwrap();
- moli_webapi_declare::register_web_api_proxy(scope, proxy).unwrap();
- let key = crate::util::v8str(scope, proxy_name);
- assert_eq!(
- global.create_data_property(scope, key.into(), proxy.into()),
- Some(true)
- );
- }
- Ok(())
- })
- .unwrap();
- assert_eq!(
- vm.eval(
- r#"(() => {
- for (const [name, element, native, properties] of [
- ['SVGFilterElement', foreignFilter, nativeFilterProxy, ['x','y','width','height','filterUnits','primitiveUnits']],
- ['SVGMarkerElement', foreignMarker, nativeMarkerProxy, ['refX','refY','markerWidth','markerHeight','markerUnits','orientType','orientAngle']],
- ]) {
- let traps = 0;
- const author = new Proxy(native, {get() {traps++;throw 42;}, getPrototypeOf() {traps++;throw 42;}});
- const revoked = Proxy.revocable(native, {}); revoked.revoke();
- for (const property of properties) {
- const getter = Object.getOwnPropertyDescriptor(window[name].prototype, property).get;
- const value = getter.call(native);
- if (value !== element[property] || value !== getter.call(element) ||
- Object.getPrototypeOf(value) !== childWindow[value.constructor.name].prototype) {
- throw Error(name + '.' + property + ' native proxy state/realm');
- }
- for (const receiver of [author, revoked.proxy, Object.create(native)]) {
- let error;
- try {getter.call(receiver);} catch (caught) {error = caught;}
- if (!(error instanceof TypeError) || traps !== 0) throw Error(property + ' author proxy accepted');
- }
- }
- }
- return true;
- })()"#,
- )
- .unwrap(),
- "true"
- );
-}
-
#[test]
fn svg_filter_set_std_deviation_uses_native_receivers_and_float_arguments() {
let mut vm = new_storage_page_task_executor_test_vm("https://svg-filter-std-deviation.test/");
diff --git a/moli-webidl-derive/src/converter.rs b/moli-webidl-derive/src/converter.rs
index ebc71d4dff1..5b0809cceb5 100644
--- a/moli-webidl-derive/src/converter.rs
+++ b/moli-webidl-derive/src/converter.rs
@@ -17,7 +17,6 @@ pub(crate) enum ConverterKind {
CallbackInterface,
Octet,
Long,
- LongLong,
ClampedLongLong,
EnforceRangeLong,
LongLong,
@@ -59,7 +58,6 @@ impl ConverterKind {
"callback_interface" => Ok(Self::CallbackInterface),
"octet" => Ok(Self::Octet),
"long" => Ok(Self::Long),
- "long_long" => Ok(Self::LongLong),
"clamped_long_long" => Ok(Self::ClampedLongLong),
"enforce_range_long" => Ok(Self::EnforceRangeLong),
"long_long" => Ok(Self::LongLong),
@@ -99,7 +97,6 @@ impl ConverterKind {
Self::CallbackInterface => quote!(::moli_webidl::WebIdlCallbackInterface),
Self::Octet => quote!(::moli_webidl::Octet),
Self::Long => quote!(::moli_webidl::Long),
- Self::LongLong => quote!(::moli_webidl::LongLong),
Self::ClampedLongLong => quote!(::moli_webidl::ClampedLongLong),
Self::EnforceRangeLong => quote!(::moli_webidl::EnforceRangeLong),
Self::LongLong => quote!(::moli_webidl::LongLong),
@@ -149,7 +146,6 @@ impl ConverterKind {
Self::CallbackFunction | Self::CallbackInterface => quote!(#expr),
Self::Octet => quote!(::moli_webidl::Octet(#expr)),
Self::Long => quote!(::moli_webidl::Long(#expr)),
- Self::LongLong => quote!(::moli_webidl::LongLong(#expr)),
Self::ClampedLongLong => quote!(::moli_webidl::ClampedLongLong(#expr)),
Self::EnforceRangeLong => quote!(::moli_webidl::EnforceRangeLong(#expr)),
Self::LongLong => quote!(::moli_webidl::LongLong(#expr)),
@@ -194,7 +190,6 @@ impl ConverterKind {
| Self::UsvString
| Self::Octet
| Self::Long
- | Self::LongLong
| Self::ClampedLongLong
| Self::EnforceRangeLong
| Self::LongLong